2026.3.5

Updated to use active jobs & services for all background work

README.md

@@ -1,14 +1,21 @@
-# Redmine QuickBooks Online
+# Redmine QuickBooks Online Plugin
 
-A plugin for Redmine to connect to QuickBooks Online.
+A plugin for **Redmine** that integrates with **QuickBooks Online (QBO)** to automatically create **Time Activity entries** from billable hours logged on Issues.
 
-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.
+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.
 
-## 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.
+# Disclaimer
 
-## Compatibility
+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
 
 | Plugin Version | Redmine Version |
 | :--- | :--- |
@@ -17,84 +24,244 @@ The goal of this project is to allow Redmine to connect with QuickBooks Online t
 | Version 1.0.0+ | Redmine 4 |
 | Version 0.8.1 | Redmine 3 |
 
-## Features
+---
 
-* **Customer Assignment:** Issues can be assigned to a Customer via a dropdown in the edit Issue form.
+# Features
-    * 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.
 
-## Prerequisites
+## Issue Billing Integration
 
-* Sign up to become a developer for Intuit: https://developer.intuit.com/
+*   Assign a **QuickBooks Customer** to a Redmine Issue.
-* Create your own application to obtain your API keys.
-* Set up the webhook service to `https://redmine.yourdomain.com/qbo/webhook`
     
-## Installation
+*   Optionally associate a **QuickBooks Estimate** with the Issue.
 
-1. **Clone the plugin:**
+*   Automatically associates a **QuickBooks Invoice** with the Issue.
-   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
-    
-    ```
-    bundle install
-    ```
-    
-3.  **Migrate your database:**
-    
-    Bash
-    
-    ```
-    bundle exec rake redmine:plugins:migrate RAILS_ENV=production
-    ```
-    
-4.  **Restart Redmine:** You must restart your Redmine server instance for the plugin and hooks to load.
-    
-5.  **Configuration:**
-    
-    *   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.
-        
-6.  **User Mapping:**
-    
-    *   Assign an Employee to each of your users via the **User Administration Page**.
     
 
-## Usage
+---
 
-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.
+## Automatic Time Activity Creation
 
-**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.
+When an Issue with an assigned Customer is closed:
 
-## TODO
+*   A **Time Activity** is created in QuickBooks for each relevant Redmine Time Entry.
     
-*   Add hooks to intergrate other plugins, i.e. customer vehicles for example
+*   Time Entries are **grouped by Activity name**.
-*   MORE Stuff as I make it up...
     
+*   Activity names are used to **dynamically match Items in QuickBooks**.
+    
+*   If no matching Item exists, the activity is **skipped**.
+    
+*   **Labor rates** are determined by the associated QuickBooks Item.
+    
+
+---
+
+## Employee Mapping
+
+Redmine Users can be mapped to **QuickBooks Employees** through the **User Administration** page.
+
+This ensures Time Activities are recorded under the correct employee in QuickBooks.
+
+---
+
+## Customer Management
+
+The plugin provides basic Customer management:
+
+*   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
+Hook|process_invoice_custom_fields, { issue: issue, invoice: invoice }  | Used to process invoice custom fields
+View Hook|:show_customer_view_right, { customer: customer } | Used to show partials on right side of customer view
+Hook| :qbo_additional_entities | Used to add additional entites to be processed by the WebhookProcessJob
+Hook| :qbo_full_sync | Used to add a Class to be called by the QboSyncDispatcher
+
+---
+
+# 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.
 
 ## License
 

app/controllers/customers_controller.rb

@@ -26,13 +26,11 @@ class CustomersController < ApplicationController
   include SortHelper
   helper :timelog
 
-  before_action :add_customer, :only => :new
+  before_action :add_customer, only: :new
-  before_action :view_customer, :except => [:new, :view]
+  before_action :view_customer, except: [:new, :view]
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:view]
 
-  default_search_scope :names
+  autocomplete :customer, :name, full: true, extra_data: [:id]
-
-  autocomplete :customer, :name, :full => true, :extra_data => [:id]
 
   def allowed_params
     params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
@@ -53,7 +51,7 @@ class CustomersController < ApplicationController
   # display a list of all customers
   def index
     if params[:search]
-      @customers = Customer.search(params[:search]).paginate(:page => params[:page])
+      @customers = Customer.search(params[:search]).order(:name).paginate(page: params[:page])
       if only_one_non_zero?(@customers)
         redirect_to @customers.first
       end
@@ -68,121 +66,124 @@ class CustomersController < ApplicationController
   # create a new customer
   def create
     @customer = Customer.new(allowed_params)
-    if @customer.save
+    @customer.save
-      flash[:notice] = "New Customer Created"
+    log "Customer ##{@customer.id} created successfully."
+    flash[:notice] = t :notice_customer_created
     redirect_to @customer
-    else
+  rescue => e
-      flash[:error] = @customer.errors.full_messages.to_sentence
+    log "Failed to create customer: #{e.message}"
+    flash[:error] = e.message
     redirect_to new_customer_path
   end
-  end
 
   # display a specific customer
   def show
-    begin
     @customer = Customer.find_by_id(params[:id])
-      @issues = @customer.issues.order(id: :desc)
+    return render_404 unless @customer
-      @billing_address = address_to_s(@customer.billing_address)
+
-      @shipping_address = address_to_s(@customer.shipping_address)
+    @open_issues = @customer.issues
-      @closed_issues = (@issues - @issues.open)
+      .joins(:status)
-      @hours = 0
+      .includes(:status, :project, :tracker, :priority)
-      @closed_hours = 0
+      .where(issue_statuses: { is_closed: false })
-      @issues.open.each { |i| @hours+= i.total_spent_hours }
+      .order(id: :desc)
-      @closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
+
-    rescue 
+    @closed_issues = @customer.issues
+      .joins(:status)
+      .includes(:status, :project, :tracker, :priority)
+      .where(issue_statuses: { is_closed: true })
+      .order(id: :desc)
+
+    @hours = TimeEntry
+      .joins(:issue)
+      .where(issues: { id: @open_issues.select(:id) })
+      .sum(:hours)
+
+    @closed_hours = TimeEntry
+      .joins(:issue)
+      .where(issues: { id: @closed_issues.select(:id) })
+      .sum(:hours)
+
+  rescue => e
+    Rails.logger.error "Failed to load customer ##{params[:id]}: #{e.message}\n#{e.backtrace.join("\n")}"
+    flash[:error] = e.message
     render_404
   end
-  end
 
   # return an HTML form for editing a customer
   def edit
-    begin
     @customer = Customer.find_by_id(params[:id])
-    rescue 
+    return render_404 unless @customer
+  rescue => e
+    log "Failed to edit customer"
+    flash[:error] = e.message
     render_404
   end
-  end
 
   # update a specific customer
   def update
-    begin
     @customer = Customer.find_by_id(params[:id])
-      if @customer.update(allowed_params)
+    @customer.update(allowed_params)
-        flash[:notice] = "Customer updated"
+    flash[:notice] = t :notice_customer_updated
     redirect_to @customer
-      else
+  rescue => e
+    log "Failed to update customer: #{e.message}"
+    flash[:error] = e.message
     redirect_to edit_customer_path
-        flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
-      end
-    rescue 
-      render_404
-    end
-  end
-
-  # delete a customer
-  def destroy
-    begin
-      Customer.find_by_id(params[:id]).destroy
-      flash[:notice] = "Customer deleted successfully"
-      redirect_to action: :index
-    rescue 
-      render_404
-    end
   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])
-    Thread.new do
+    token = issue.share_token
-      logger.info "Removing expired customer tokens"
+    redirect_to view_path(token.token)
-      CustomerToken.remove_expired_tokens
+  rescue ActiveRecord::RecordNotFound
-      ActiveRecord::Base.connection.close
+    flash[:error] = t(:notice_issue_not_found)
-    end
-
-    begin
-      issue = Issue.find_by_id(params[:id])
-      redirect_to view_path issue.share_token.token
-    rescue
     render_404
   end
-  end
   
   # displays an issue for a customer with a provided security CustomerToken
   def view
+    User.current = User.anonymous
 
-    User.current = User.find_by lastname: 'Anonymous'
+    # Load only active, non-expired token
+    @token = CustomerToken.active.find_by(token: params[:token])
+    return render_403 unless @token
 
-    @token = CustomerToken.find_by token: params[:token]
+    # Load associated issue
-    begin
+    @issue = @token.issue
-      @token.destroy if @token.expired?
+    return render_403 unless @issue
-      raise "Token Expired" if @token.destroyed
 
+    # 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
-      @issue = Issue.find @token.issue_id
+
-      @journals = @issue.journals.
+    load_issue_data
-        preload(:details).
+  rescue ActiveRecord::RecordNotFound
-        preload(:user => :email_address).
+    render_403
-        reorder(:created_on, :id).to_a
+  end
-      @journals.each_with_index {|j,i| j.indice = i+1}
+
+  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.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) && r.other_issue(@issue).visible? }
+    @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)
+    @time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
     @relation   = IssueRelation.new
-    rescue
-      render_403
   end
-  end
-
-  private
 
   # redmine permission - add customers
   def add_customer
@@ -208,17 +209,30 @@ class CustomersController < ApplicationController
   end
 
   # format a quickbooks address to a human readable string
-  def address_to_s (address)
+  def address_to_s(address)
     return if address.nil?
-    string = address.line1 if address.line1
+
-    string << "\n" + address.line2 if address.line2
+    lines = [
-    string << "\n" + address.line3 if address.line3
+      address.line1,
-    string << "\n" + address.line4 if address.line4
+      address.line2,
-    string << "\n" + address.line5 if address.line5
+      address.line3,
-    string << " " + address.city if address.city
+      address.line4,
-    string << ", " + address.country_sub_division_code if address.country_sub_division_code
+      address.line5
-    string << " " + address.postal_code if address.postal_code
+    ].compact_blank
-    return string
+
+    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

app/controllers/estimate_controller.rb

@@ -8,51 +8,72 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class EstimateController < ApplicationController
-  
   include AuthHelper
 
-  before_action :require_user, :unless => proc {|c| session[:token].nil? }
+  before_action :require_user, unless: -> { session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: -> { session[:token].nil? }
+  before_action :load_estimate, only: [:show, :doc]
   
-  def get_estimate
+  # Displays the estimate PDF in the browser or redirects with an error if not found.
-    # Force sync for estimate by doc number if not found
-    if  Estimate.find_by_doc_number(params[:search]).nil?
-      begin
-        Estimate.sync_by_doc_number(params[:search]) if params[:search]
-      rescue
-        logger.info "Estimate.find_by_doc_number failed"
-      end
-    end
-
-    estimate = Estimate.find_by_id(params[:id]) if params[:id]
-    estimate = Estimate.find_by_doc_number(params[:search]) if params[:search]
-    return estimate
-  end
-  
-  #
-  # Downloads and forwards the estimate pdf
-  #
-  def show
-    estimate = get_estimate
-
-    begin
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
-    rescue
-      redirect_to :back, :flash => { :error => "Estimate not found" }
-    end
-  end
-
-  #
-  # Downloads estimate by document number
-  #
   def doc
-    estimate = get_estimate
+    render_pdf(@estimate)
+  end
 
-    begin
+  # Displays the estimate PDF in the browser or redirects with an error if not found.
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+  def show
-    rescue
+    render_pdf(@estimate)
-      redirect_to :back, :flash => { :error => "Estimate not found" }
+  end
+
+  private
+
+  # Loads the estimate based on ID or doc number, with a fallback to sync if not found locally.
+  def load_estimate
+    log "Attempting to load Estimate with params: #{params.inspect}"
+    @estimate = find_estimate || sync_and_find_estimate
+
+    unless @estimate
+      redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_estimate_not_found) }
     end
   end
 
+  # Attempts to find the estimate locally by ID or doc number.
+  def find_estimate
+    return Estimate.find_by(doc_number: params[:search]) if params[:search].present?
+    return Estimate.find_by(id: params[:id]) if params[:id].present?
+  end
+
+  # If the estimate is not found locally, attempts to sync it from the source and find it again.
+  def sync_and_find_estimate
+
+    if params[:search].present?
+      log "Estimate #{params[:search]} not found locally. Syncing by doc number."
+      Estimate.sync_by_doc_number(params[:search])
+      return Estimate.find_by(doc_number: params[:search])
+    end
+
+    if params[:id].present?
+      log "Estimate #{params[:id]} not found locally. Syncing by ID."
+      Estimate.sync_by_id(params[:id])
+      return Estimate.find_by(id: params[:id])
+    end
+
+    nil
+  rescue StandardError => e
+    log "Estimate sync failed: #{e.message}"
+    nil
+  end
+
+  # Renders the estimate PDF or redirects with an error if rendering fails.
+  def render_pdf(estimate)
+    pdf, ref = EstimatePdfService.new(qbo: 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}"
+    redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_estimate_not_found) }
+  end
+
+  # Logs messages with a consistent prefix for easier debugging.
+  def log(msg)
+    Rails.logger.info "[EstimateController] #{msg}"
+  end
 end

app/controllers/invoice_controller.rb

@@ -8,47 +8,29 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class InvoiceController < ApplicationController
-  
   include AuthHelper
-  require 'combine_pdf'
 
-  before_action :require_user, :unless => proc {|c| session[:token].nil? }
+  before_action :require_user, unless: -> { session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: -> { session[:token].nil? }
 
-  #
+  # Displays the invoice PDF in the browser or redirects with an error if not found.
-  # Downloads and forwards the invoice pdf
-  #
   def show
-    logger.info("Processing request for URL: #{request.original_url}") 
+    log "Processing request for #{request.original_url}"
-    begin
-      qbo = Qbo.first
-        qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
 
-        # If multiple id's then pull each pdf & combine them
+    invoice_ids = Array(params[:invoice_ids] || params[:id])
-        if params[:invoice_ids]
+    pdf, ref = InvoicePdfService.new(qbo: QboConnectionService.current!).fetch_pdf(doc_ids: invoice_ids)
-          logger.info("Grabbing pdfs for " + params[:invoice_ids].join(', '))
+
-          ref = ""
+    send_data pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"
-          params[:invoice_ids].each do |i|
+
-            logger.info("processing " + i)
+  rescue StandardError => e
-            invoice = service.fetch_by_id(i)
+    log "Invoice PDF failure: #{e.message}"
-            ref += " #{invoice.doc_number}"
+    redirect_back fallback_location: root_path, flash: { error: I18n.t(:notice_invoice_not_found) }
-            @pdf << CombinePDF.parse(service.pdf(invoice)) unless @pdf.nil?
-            if @pdf.nil?
-              @pdf = CombinePDF.parse(service.pdf(invoice))
-            end
-          end
-          @pdf = @pdf.to_pdf
-        else
-          invoice = service.fetch_by_id(params[:id])
-          @pdf = service.pdf(invoice)
-          ref = invoice.doc_number
   end
 
-        send_data @pdf, filename: "invoice #{ref}.pdf", :disposition => 'inline', :type => "application/pdf"
+  private
-      end
+
-    rescue
+  # Logs messages with a consistent prefix for easier debugging.
-      redirect_to :back, :flash => { :error => "Invoice not found" }
+  def log(msg)
-    end
+    Rails.logger.info "[InvoiceController] #{msg}"
   end
 end

app/controllers/qbo_controller.rb

@@ -9,149 +9,68 @@
 #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 QboController < ApplicationController
-  
-  require 'openssl'
-  
   include AuthHelper
 
-  before_action :require_user, :except => :webhook
+  before_action :require_user, except: :webhook
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, only: :webhook
 
-  def allowed_params
+  # Initiates the OAuth authentication process by redirecting the user to the QuickBooks authorization URL. The callback URL is generated based on the application's settings and routes.
-    params.permit(:code, :state, :realmId, :id)
-  end
-
-  #
-  # Called when the user requests that Redmine to connect to QBO
-  #
   def authenticate
-    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
+    redirect_to QboOauthService.authorization_url(callback_url: callback_url)
-    logger.info "redirect_uri: #{redirect_uri}"
-    oauth2_client = Qbo.construct_oauth2_client
-    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
-    redirect_to grant_url
   end
 
-  #
+  # Handles the OAuth callback from QuickBooks. Exchanges the authorization code for access and refresh tokens, saves the connection details, and redirects to the sync page with a success notice. If any error occurs during the process, logs the error and redirects back to the plugin settings page with an error message.
-  # Called by QBO after authentication has been processed
-  #
   def oauth_callback
-    if params[:state].present?
+    QboOauthService.exchange!(code: params[:code], callback_url: callback_url, realm_id: params[:realmId])
-      oauth2_client = Qbo.construct_oauth2_client
-      # use the state value to retrieve from your backend any information you need to identify the customer in your system
-      redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
-      if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
 
-        # Remove the last authentication information
+    redirect_to qbo_sync_path, flash: { notice: I18n.t(:label_connected) }
-        Qbo.delete_all
 
-        # Save the authentication information 
+  rescue StandardError => e
-        qbo = Qbo.new
+    log "OAuth failure: #{e.message}"
-        qbo.update(oauth2_access_token: resp.token, oauth2_refresh_token: resp.refresh_token, realm_id: params[:realmId])
+    redirect_to plugin_settings_path(:redmine_qbo), flash: { error: I18n.t(:label_error) }
-        qbo.refresh_token!
-        
-        if qbo.save!
-          redirect_to qbo_sync_path, :flash => { :notice => I18n.t(:label_connected) }
-        else
-          redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => I18n.t(:label_error) }
   end
 
-      end
+  # Manual billing endpoint to trigger the billing process for a specific issue. Validates the issue and its associations, enqueues a job to bill the issue's time entries, and redirects back to the issue with a notice. If validation fails, redirects back with an error message.
-    end
-  end
-  
-  # Manual Billing
   def bill
-    i = Issue.find_by_id params[:id]
+    issue = Issue.find_by(id: params[:id])
-    if i.customer
+    raise I18n.t(:notice_error_issue_not_found) unless issue
-      i.bill_time
+    raise I18n.t(:notice_billing_error_no_customer) unless issue.customer
-      redirect_to i, :flash => { :notice => I18n.t(:label_billed_success) + i.customer.name }
+    raise I18n.t(:notice_billing_error_no_employee) unless issue.assigned_to&.employee_id.present?
-    else
+    raise I18n.t(:notice_billing_error_no_qbo) unless Qbo.exists?
-      redirect_to i, :flash => { :error => I18n.t(:label_billing_error) }
+
-    end
+    BillIssueTimeJob.perform_later(issue.id)
+
+    redirect_to issue, flash: { notice: "#{I18n.t(:label_billing_enqueued)} #{issue.customer.name}"}
+
+  rescue StandardError => e
+    redirect_to issue || root_path, flash: { error: e.message }
   end
 
-  # Quickbooks Webhook Callback
+  # 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 webhook
-
-    logger.info "Quickbooks is calling webhook"
-    
-    # check the payload
-    signature = request.headers['intuit-signature']
-    key = Setting.plugin_redmine_qbo['settingsWebhookToken']
-    data = request.body.read
-    hash = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, data)).strip()
-    
-    # proceed if the request is good
-    if hash.eql? signature
-      Thread.new do
-        if request.headers['content-type'] == 'application/json'
-          data = JSON.parse(data)
-        else
-          # application/x-www-form-urlencoded
-          data = params.as_json
-        end
-        # Process the information
-        entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
-        entities.each do |entity|
-          id = entity['id'].to_i
-          name = entity['name']
-        
-          logger.info "Casting #{name.constantize} to obj"
-
-          # Magicly initialize the correct class
-          obj = name.constantize
-
-          # for merge events
-          obj.destroy(entity['deletedId']) if entity['deletedId']
-          
-          #Check to see if we are deleting a record
-          if entity['operation'].eql? "Delete"
-            obj.destroy(id)
-          #if not then update!
-          else
-            begin
-              obj.sync_by_id(id)
-            rescue => e
-              logger.error "Failed to call sync_by_id on obj"
-              logger.error e.message
-              logger.error e.backtrace.join("\n")
-            end
-          end
-        end
-        
-        # Record that last time we updated
-        Qbo.update_time_stamp
-        ActiveRecord::Base.connection.close
-      end
-      # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true, status: 200
-    else
-      render nothing: true, status: 400
-    end
-
-    logger.info "Quickbooks webhook complete"
-  end
-
-  #
-  # Synchronizes the QboCustomer table with QBO
-  #
   def sync
-    logger.info "Syncing EVERYTHING"
+    QboSyncDispatcher.full_sync!
-    # Update info in background
+    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
-    Thread.new do
-      if Qbo.exists?
-        Customer.sync
-        Invoice.sync
-        Employee.sync
-        Estimate.sync
-        
-        # Record the last sync time
-        Qbo.update_time_stamp
-      end
-      ActiveRecord::Base.connection.close
   end
 
-    redirect_to :home, :flash => { :notice => I18n.t(:label_syncing) }
+  # Endpoint to receive QuickBooks webhook notifications. Validates the request and processes the payload to sync relevant data to Redmine. Responds with appropriate HTTP status codes based on success or failure of processing.
+  def webhook
+    QboWebhookProcessor.process!(request: request)
+    head :ok
+
+  rescue StandardError => e
+    log "Webhook failure: #{e.message}"
+    head :unauthorized
+  end
+
+  private
+
+  # Constructs the OAuth callback URL based on the application's settings and routes. This URL is used during the OAuth flow to redirect users back to the application after authentication with QuickBooks.
+  def callback_url
+    "#{Setting.protocol}://#{Setting.host_name}#{qbo_oauth_callback_path}"
+  end
+
+  # Logs messages with a consistent prefix for easier debugging and monitoring.
+  def log(msg)
+    Rails.logger.info "[QboController] #{msg}"
   end
 end

app/helpers/auth_helper.rb

@@ -13,6 +13,7 @@ module AuthHelper
   def require_user
     return unless session[:token].nil?
     if !User.current.logged?
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end
@@ -27,6 +28,7 @@ module AuthHelper
   
   def check_permission(permission)
     if !allowed_to?(permission)
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end
@@ -34,6 +36,7 @@ module AuthHelper
   
   def global_check_permission(permission)
     if !globaly_allowed_to?(permission)
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end

app/jobs/bill_issue_time_job.rb

@@ -0,0 +1,112 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class BillIssueTimeJob < ActiveJob::Base
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Perform billing of unbilled time entries for a given issue by creating corresponding TimeActivity records in QuickBooks Online, and then marking those entries as billed in Redmine. This job is typically triggered after an invoice is created or updated to ensure all relevant time is captured for billing.
+  def perform(issue_id)
+    issue = Issue.find(issue_id)
+
+    log "Starting billing for issue ##{issue.id}"
+    issue.with_lock do
+      unbilled_entries = issue.time_entries.where(billed: [false, nil]).lock
+      return if unbilled_entries.blank?
+
+      totals = aggregate_hours(unbilled_entries)
+      return if totals.blank?
+      log "Aggregated hours for billing: #{totals.inspect}"
+
+      qbo = QboConnectionService.current!
+      qbo.perform_authenticated_request do |access_token|
+        create_time_activities(issue, totals, access_token, qbo)
+      end
+
+      # Only mark billed AFTER successful QBO creation
+      unbilled_entries.update_all(billed: true)
+    end
+
+    log "Completed billing for issue ##{issue.id}"
+    Qbo.update_time_stamp
+  rescue => e
+    log "Billing failed for issue ##{issue_id} - #{e.message}"
+    raise e
+  end
+
+  private
+
+  # Aggregate time entries by activity name and sum their hours
+  def aggregate_hours(entries)
+    entries.includes(:activity)
+           .group_by { |e| e.activity&.name }
+           .transform_values { |rows| rows.sum(&:hours) }
+           .compact
+  end
+
+  # Create TimeActivity records in QBO for each activity type with the appropriate hours and link them to the issue's assigned employee and customer
+  def create_time_activities(issue, totals, access_token, qbo)
+    log "Creating TimeActivity records in QBO for issue ##{issue.id}"
+   
+    time_service = Quickbooks::Service::TimeActivity.new( company_id: qbo.realm_id,  access_token: access_token)
+    item_service = Quickbooks::Service::Item.new( company_id: qbo.realm_id, access_token: access_token )
+    
+    totals.each do |activity_name, hours_float|
+      next if activity_name.blank?
+      next if hours_float.to_f <= 0
+
+      item = find_item(item_service, activity_name)
+      next unless item
+
+      hours, minutes = convert_hours(hours_float)
+
+      time_entry = Quickbooks::Model::TimeActivity.new
+      time_entry.description     = build_description(issue)
+      time_entry.employee_id     = issue.assigned_to.employee_id
+      time_entry.customer_id     = issue.customer_id
+      time_entry.billable_status = "Billable"
+      time_entry.hours           = hours
+      time_entry.minutes         = minutes
+      time_entry.name_of         = "Employee"
+      time_entry.txn_date        = Date.today
+      time_entry.hourly_rate     = item.unit_price
+      time_entry.item_id         = item.id
+
+      log "Creating TimeActivity for #{activity_name} (#{hours}h #{minutes}m)"
+
+      time_service.create(time_entry)
+    end
+  end
+
+  # Convert a decimal hours float into separate hours and minutes components for QBO TimeActivity
+  def convert_hours(hours_float)
+    total_minutes = (hours_float.to_f * 60).round
+    hours = total_minutes / 60
+    minutes = total_minutes % 60
+    [hours, minutes]
+  end
+
+  # Build a descriptive string for the TimeActivity based on the issue's tracker, ID, subject, and completion status
+  def build_description(issue)
+    base = "#{issue.tracker} ##{issue.id}: #{issue.subject}"
+    return base if issue.closed?
+    "#{base} (Partial @ #{issue.done_ratio}%)"
+  end
+
+  # Find an item in QBO by name, escaping single quotes to prevent query issues. Returns nil if not found.
+  def find_item(item_service, name)
+    safe = name.gsub("'", "\\\\'")
+    item_service.query("SELECT * FROM Item WHERE Name = '#{safe}'").first
+  end
+
+  def log(msg)
+    Rails.logger.info "[BillIssueTimeJob] #{msg}"
+  end
+end

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

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

app/jobs/estimate_sync_job.rb

@@ -0,0 +1,38 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class EstimateSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  # Performs a sync of estimates from QuickBooks Online.
+  def perform(full_sync: false, id: nil, doc_number: nil)
+    qbo = QboConnectionService.current!
+    raise "No QBO configuration found" unless qbo
+
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for estimate ##{id || doc_number || 'all'}..."
+
+    service = EstimateSyncService.new(qbo: qbo)
+
+    if id.present?
+      service.sync_by_id(id)
+    elsif doc_number.present?
+      service.sync_by_doc(doc_number)
+    else
+      service.sync(full_sync: full_sync)
+    end
+  end
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[EstimateSyncJob] #{msg}"
+  end
+end

app/jobs/invoice_sync_job.rb

@@ -8,22 +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.
 
-module Hooks
+class InvoiceSyncJob < ApplicationJob
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
 
-  class UsersShowHookListener < Redmine::Hook::ViewListener
+  # 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
 
-    # View User
+    log "Starting #{full_sync ? 'full' : 'incremental'} sync for invoice ##{id || 'all'}..."
-    def view_users_form(context={})
 
-      # Update the users
+    service = InvoiceSyncService.new(qbo: qbo)
-      #Employee.update_all
 
-      # Check to see if there is a quickbooks user attached to the issue
+    if id.present?
-      @selected = context[:user].employee.id if context[:user].employee
+      service.sync_by_id(id)
-
+    else
-      # Generate the drop down list of quickbooks contacts
+      service.sync(full_sync: full_sync)
-      return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
     end
   end
 
+  private
+
+  def log(msg)
+    Rails.logger.info "[InvoiceSyncJob] #{msg}"
+  end
 end

app/jobs/qbo_sync_dispatcher.rb

@@ -0,0 +1,41 @@
+#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 QboSyncDispatcher
+
+  SYNC_JOBS = [
+    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.full_sync!
+
+    jobs = SYNC_JOBS.dup
+
+    # Allow other plugins to add addtional sync jobs via Hooks
+    Redmine::Hook.call_hook( :qbo_full_sync ).each do |context|
+        next unless context
+        jobs.push context
+        log "Added additionals QBO Sync Job for #{contex.to_s}"
+    end
+
+    jobs.each { |job| job.perform_later(full_sync: true) }
+  end
+
+  private
+
+  def self.log(msg)
+    Rails.logger.info "[QboSyncDispatcher] #{msg}"
+  end
+  
+end

app/jobs/qbo_webhook_processor.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 QboWebhookProcessor
+
+  # Processes the incoming QuickBooks webhook request by validating the signature and enqueuing a background job to handle the webhook payload. Raises an error if the signature is invalid.
+  def self.process!(request:)
+    body = request.raw_post
+    signature = request.headers['intuit-signature']
+    secret = Setting.plugin_redmine_qbo['settingsWebhookToken']
+
+    raise "Invalid signature" unless valid_signature?(body, signature, secret)
+
+    WebhookProcessJob.perform_later(body)
+  end
+
+  private
+
+  # Validates the QuickBooks webhook request by computing the HMAC signature and comparing it to the provided signature. Returns false if either the signature or secret is blank, or if the computed signature does not match the provided signature.
+  def self.valid_signature?(body, signature, secret)
+    return false if signature.blank? || secret.blank?
+    log "Validating signature"
+
+    digest = OpenSSL::Digest.new('sha256')
+    computed = Base64.strict_encode64(
+      OpenSSL::HMAC.digest(digest, secret, body)
+    )
+
+    ActiveSupport::SecurityUtils.secure_compare(computed, signature)
+  end
+
+  def self.log(msg)
+    Rails.logger.info "[QboWebhookProcessor] #{msg}"
+  end
+end

app/jobs/webhook_process_job.rb

@@ -0,0 +1,75 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class WebhookProcessJob < ActiveJob::Base
+  queue_as :default
+  retry_on StandardError, wait: 5.minutes, attempts: 5
+
+  ALLOWED_ENTITIES = %w[
+    Customer
+    Invoice
+    Estimate
+    Employee
+  ].freeze
+
+  # Process incoming QBO webhook notifications and sync relevant data to Redmine
+  def perform(raw_body)
+    log "Received webhook: #{raw_body}"
+    data = JSON.parse(raw_body)
+
+    data.fetch('eventNotifications', []).each do |notification|
+      entities = notification.dig('dataChangeEvent', 'entities') || []
+
+      entities.each do |entity|
+        process_entity(entity)
+      end
+    end
+
+    Qbo.update_time_stamp
+  end
+
+  private
+
+  # Process a single entity from the webhook payload and sync it to Redmine if it's an allowed type
+  def process_entity(entity)
+    log "Processing entity: #{entity}"
+    name = entity['name']
+    id   = entity['id']&.to_i
+
+    entitys = 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
+        entitys.push context
+        log "Added additional QBO entities: #{context}"
+    end
+    return unless entitys.include?(name)
+
+    model = name.safe_constantize
+    return unless model
+
+    if entity['deletedId']
+      model.delete(entity['deletedId'])
+      return
+    end
+
+    if entity['operation'] == "Delete"
+      model.delete(id)
+    else
+      model.sync_by_id(id)
+    end
+  rescue => e
+    log "#{e.message}"
+  end
+
+  def log(msg)
+    Rails.logger.info "[WebhookProcessJob] #{msg}"
+  end
+end

app/models/concerns/quickbooks_oauth.rb

@@ -13,12 +13,13 @@ module QuickbooksOauth
 
   #== Instance Methods
 
+  # This method will attempt to execute the block and if it encounters an OAuth2::Error or Quickbooks::AuthorizationFailure it will attempt to refresh the token and retry the block.  It will try this up to 3 times before giving up and raising an exception.
   def perform_authenticated_request(&block)
     attempts = 0
     begin
       yield oauth_access_token
     rescue OAuth2::Error, Quickbooks::AuthorizationFailure => ex
-      Rails.logger.error("QuickbooksOauth.perform: #{ex.message}")
+      log "perform_authenticated_request: #{ex.message}"
 
       # to prevent an infinite loop here keep a counter and bail out after N times...
       attempts += 1
@@ -32,8 +33,9 @@ module QuickbooksOauth
     end
   end
 
+  # This method will attempt to refresh the access token and update the record with the new access token, refresh token and their respective expiration times.  If the refresh token expires in more than 0 seconds then we will set the refresh token expiration time to that value, otherwise we will set it to 100 days from now.
   def refresh_token!
-    Rails.logger.info("QuickbooksOauth.refresh_token!")
+    log "refresh_token!"
     t = oauth_access_token
     refreshed = t.refresh!
 
@@ -43,7 +45,7 @@ module QuickbooksOauth
       oauth2_refresh_token_expires_at = 100.days.from_now
     end
 
-    Rails.logger.info("QuickbooksOauth.refresh_token!: #{oauth2_refresh_token_expires_at}")
+    log "refresh_token!: #{oauth2_refresh_token_expires_at}"
 
     update!(
       oauth2_access_token: refreshed.token,
@@ -53,28 +55,32 @@ module QuickbooksOauth
     )
   end
 
+  # This method will return an instance of the OAuth2::Client class that is configured with the consumer key, consumer secret and the appropriate URLs for the Intuit OAuth2 service.  It will also set the sandbox mode based on the plugin settings.
   def oauth_client
     self.class.construct_oauth2_client
   end
 
+  # This method will return an instance of the OAuth2::AccessToken class that is configured with the current access token, refresh token and the OAuth2 client.  This access token can be used to make authenticated requests to the Intuit API.
   def oauth_access_token
     OAuth2::AccessToken.new(oauth_client, oauth2_access_token, refresh_token: oauth2_refresh_token)
   end
 
+  # This method is an alias for the oauth_access_token method and is used to provide a more intuitive name for the access token when making authenticated requests.
   def consumer
     oauth_access_token
   end
 
   module ClassMethods
 
+    # This method will construct and return an instance of the OAuth2::Client class that is configured with the consumer key, consumer secret and the appropriate URLs for the Intuit OAuth2 service.  It will also set the sandbox mode based on the plugin settings.  This method is used by the instance method oauth_client to create a new OAuth2 client for each instance of the model that includes this concern.
     def construct_oauth2_client
 
       oauth_consumer_key = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
       oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
 
       # Are we are playing in the sandbox?
-      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo['sandbox'] ? true : false
+      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false
-      logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}"
+      log "Sandbox mode: #{Quickbooks.sandbox_mode}"
 
       options = {
         site: "https://appcenter.intuit.com/connect/oauth2",
@@ -85,4 +91,11 @@ module QuickbooksOauth
     end
 
   end
+
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[QuickbooksOauth] #{msg}"
+  end
 end

app/models/customer.rb

@@ -10,209 +10,178 @@
 
 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 :id, :name
+  before_validation :normalize_phone_numbers
   
   self.primary_key = :id
 
-  # returns a human readable string
+  acts_as_searchable columns: %w[name phone_number mobile_phone_number ],
-  def to_s
+                     scope: ->(_context) { left_joins(:project) },
-    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
+                     date_column: :updated_at
+
+  acts_as_event :title => Proc.new {|o| "#{o}"},
+                :url => Proc.new {|o| { :controller => 'customers', :action => 'show', :id => o.id} },
+                :type => :to_s,
+                :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 (@details ||= Quickbooks::Model::Customer.new) if new_record?
+
+    @details ||= begin
+      xml = Rails.cache.fetch(details_cache_key, expires_in: 10.minutes) do
+        fetch_details.to_xml_ns
       end
 
-  # Convenience Method
+      Quickbooks::Model::Customer.from_xml(xml)
-  # returns the customer's email
+    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
-    pull unless @details
+    details
-    begin
+    return @details&.email_address&.address
-      return @details.email_address.address
-    rescue
-      return nil
-    end
   end
   
-  # Convenience Method
+  # Updates the customer's email address
-  # Sets the email
   def email=(s)
-    pull unless @details
+    details
     @details.email_address = s
   end
   
-  # Convenience Method
+
-  # returns the customer's primary phone
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
-  def primary_phone
+  def self.last_sync
-    pull unless @details
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
-    begin
+    format_time(maximum(:updated_at))
-      return @details.primary_phone.free_form_number
-    rescue
-      return nil
-    end
   end
   
-  # Convenience Method
+  # Customers are not bound by a project
-  # Updates the customer's primary phone number
+  # but we need to implement this method for the Redmine::Acts::Searchable interface
-  def primary_phone=(n)
+  def project
-    pull unless @details
+    nil
-    pn = Quickbooks::Model::TelephoneNumber.new
-    pn.free_form_number = n
-    @details.primary_phone = pn
-    #update our locally stored number too
-    update_phone_number
-  end
-  
-  # Convenience Method
-  # returns the customer's mobile phone
-  def mobile_phone
-    pull unless @details
-    begin
-      return @details.mobile_phone.free_form_number
-    rescue
-      return nil
-    end
-  end
-  
-  # Convenience Method
-  # Updates the custome's mobile phone number
-  def mobile_phone=(n)
-    pull unless @details
-    pn = Quickbooks::Model::TelephoneNumber.new
-    pn.free_form_number = n
-    @details.mobile_phone = pn
-    #update our locally stored number too
-    update_mobile_phone_number
-  end
-
-  # Convenience Method
-  # Sets the notes
-  def notes=(s)
-    pull unless @details
-    @details.notes = s
-  end
-  
-  # update the localy stored phone number as a plain string with no special chars
-  def update_phone_number
-    begin
-      self.phone_number = self.primary_phone.tr('^0-9', '')
-    rescue
-      return nil
-    end
-  end
-  
-  # update the localy stored phone number as a plain string with no special chars
-  def update_mobile_phone_number
-    begin
-      self.mobile_phone_number = self.mobile_phone.tr('^0-9', '')
-    rescue
-      return nil
-    end
-  end
-  
-  # Convenience Method
-  # Updates Both local DB name & QBO display_name
-  def name=(s)
-    pull unless @details
-    @details.display_name = s
-    super
   end
 
   # Magic Method
   # Maps Get/Set methods to QBO customer object
-  def method_missing(sym, *arguments)
+  def method_missing(method_name, *args, &block)
-    # Check to see if the method exists
+    if Quickbooks::Model::Customer.method_defined?(method_name)
-    if Quickbooks::Model::Customer.method_defined?(sym)
+      details
-      # download details if required
+      @details.public_send(method_name, *args, &block)
-      pull unless @details
-      method_name = sym.to_s
-      # Setter
-      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])
-      # Getter
     else
-        return @details.method(method_name).call 
+      super
-      end
-    end
-  end
-  
-  # proforms a bruteforce sync operation
-  # This needs to be simplified
-  def self.sync 
-    # Sync ALL customers if the database is empty
-    qbo = Qbo.first
-    customers = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.all
-    end
-    
-    return unless customers
-    
-    customers.each do |c|
-      logger.info "Processing customer #{c.id}"
-      customer = Customer.find_or_create_by(id: c.id)
-      if c.active?
-        #if not customer.name.eql? c.display_name
-          customer.name = c.display_name
-          customer.id = c.id
-          customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
-          customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
-          customer.save_without_push
-        #end
-      else
-        if not c.new_record?
-          customer.delete
-        end
-      end
     end
   end
 
-  # Searchs the database for a customer by name or phone number with out special chars
+  # returns the customer's mobile phone
+  def mobile_phone
+    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
+  end
+
+  # Updates Both local DB name & QBO display_name
+  def name=(s)
+    details
+    @details.display_name = s
+    super
+  end
+
+  # Normalizes phone numbers by removing non-digit characters. This method is called before validation to ensure that phone numbers are stored in a consistent format, which can help with searching and integration with external systems like QuickBooks Online.
+  def normalize_phone_numbers
+    self.phone_number = phone_number.to_s.gsub(/\D/, '') if phone_number.present?
+    self.mobile_phone_number = mobile_phone_number.to_s.gsub(/\D/, '') if mobile_phone_number.present?
+  end
+
+  # Sets the notes for the customer
+  def notes=(s)
+    details
+    @details.notes = s
+  end
+
+  # returns the customer's primary phone
+  def primary_phone
+    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
+  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
   def self.search(search)
-    customers = where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
+    #return none if search.blank?
-    return customers.order(:name)
+    search = sanitize_sql_like(search)
+    where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
   end
 
-  # proforms a bruteforce sync operation
+  # Override the defult redmine seach method to rank results by id
-  # This needs to be simplified
+  def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
+    return {} if tokens.blank?
+
+    scope = self.all
+
+    tokens.each do |token|
+      scope = scope.search(token)
+    end
+
+    ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
+    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) 
-    qbo = Qbo.first
+    CustomerSyncJob.perform_later(id: id)
-    c = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.fetch_by_id(id)
   end
   
-    return unless c
+  # returns a human readable string
-
+  def to_s
-    customer = Customer.find_or_create_by(id: c.id)
+    last4 = phone_number&.last(4)
-    if c.active?
+    last4.present? ? "#{name} - #{last4}" : name.to_s
-      #if not customer.name.eql? c.display_name
-        customer.name = c.display_name
-        customer.id = c.id
-        customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
-        customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
-        customer.save_without_push
-      #end
-    else
-      if not customer.new_record?
-        customer.delete
-      end
-    end
   end
 
   # Push the updates
   def save_with_push
-    begin
+    log "Starting push for customer ##{self.id}..."
-      qbo = Qbo.first
+    qbo = QboConnectionService.current!
-      @details = qbo.perform_authenticated_request do |access_token|
+    CustomerService.new(qbo: qbo, customer: self).push()
-        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+    Rails.cache.delete(details_cache_key)
-        service.update(@details)
-      end
-      #raise "QBO Fault" if @details.fault?
-      self.id = @details.id
-    rescue Exception => e
-      errors.add(e.message)
-    end
     save_without_push
   end
 
@@ -221,18 +190,17 @@ class Customer < ActiveRecord::Base
   
   private
 
-  # pull the details
+  # 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 pull
+  def fetch_details
-    begin
+    return Quickbooks::Model::Customer.new unless id.present?
-      raise Exception unless self.id
+    log "Fetching details for customer ##{id} from QBO..."
-      qbo = Qbo.first
+    qbo = QboConnectionService.current!
-      @details = qbo.perform_authenticated_request do |access_token|
+    CustomerService.new(qbo: qbo, customer: self).pull()
-        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-        service.fetch_by_id(self.id)
-      end
-    rescue Exception => e
-      @details = Quickbooks::Model::Customer.new
   end
+
+  # Log messages with the entity type for better traceability
+  def log(msg)
+    Rails.logger.info "[Customer] #{msg}"
   end
   
 end

app/models/customer_token.rb

@@ -8,54 +8,49 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CustomerToken < ActiveRecord::Base
+class CustomerToken < ApplicationRecord
+  belongs_to :issue
 
-  has_many :issues
+  validates :issue_id, presence: true
-  validates_presence_of :issue_id
+  validates :token, presence: true, uniqueness: true
-  before_create :generate_token, :generate_expire_date
-  attr_accessor :destroyed
-  after_destroy :mark_as_destroyed
 
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE__' + SecureRandom.uuid
+  before_validation :generate_token, on: :create
+  before_validation :generate_expire_date, on: :create
 
-  # generates a random token using the plugin setting settingsOAuthConsumerSecret for salt
+  scope :active, -> { where("expires_at > ?", Time.current) }
-  def generate_token
-    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
-  end
 
-  # generates an expiring date
+  TOKEN_EXPIRATION = 1.month
-  def generate_expire_date
-    self.expires_at = Time.now + 1.month
-  end
 
-  # set destroyed flag
+  # Check if the token has expired
-  def mark_as_destroyed
-    self.destroyed = true
-  end
-
-  # purge expired tokens
-  def self.remove_expired_tokens
-    where("expires_at < ?", Time.now).destroy_all
-  end
-  
-  # has the token expired?
   def expired?
-    self.expires_at < Time.now
+    expires_at.present? && expires_at <= Time.current
   end
 
-  # Getter convenience method for tokens
+  # Remove expired tokens from the database
+  def self.remove_expired_tokens
+    where("expires_at <= ?", Time.current).delete_all
+  end
+
+  # Get or create a token for the given issue
   def self.get_token(issue)
+    return unless issue
+    return unless User.current.allowed_to?(:view_issues, issue.project)
 
-    # check to see if token exists & if it is expired
+    token = active.find_by(issue_id: issue.id)
-    token = find_by_issue_id issue.id
+    return token if token
-    unless token.nil?
+
-      return token unless token.expired?
+    create!(issue: issue)
-      # remove expired tokens
-      token.destroy
   end
 
-    # only create new token if we have an issue to attach it to
+  private
-    return create(:issue_id => issue.id) if User.current.logged?
+
+  # Generate a unique token for the customer
+  def generate_token
+    self.token ||= SecureRandom.urlsafe_base64(32)
   end
 
+  # Generate an expiration date for the token
+  def generate_expire_date
+    self.expires_at ||= Time.current + TOKEN_EXPIRATION
+  end
 end

app/models/employee.rb

@@ -10,41 +10,27 @@
 
 class Employee < ActiveRecord::Base
   
+  include Redmine::I18n
+
   has_many :users
   validates_presence_of :id, :name
 
+  self.primary_key = :id
+
+  # 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
-    qbo = Qbo.first
+    EmployeeSyncJob.perform_later(full_sync: true)
-    employees = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.all
-    end
-
-    return unless employees
-    
-    transaction do
-      # Update the item table
-      employees.each { |e|
-        logger.info "Processing employee #{e.id}"
-        employee = 	find_or_create_by(id: e.id)
-        employee.name = e.display_name
-        employee.id = e.id
-        employee.save!
-      }
-    end
   end
 
+  # Sync a single employee by ID, typically triggered by a webhook notification or manual sync request
   def self.sync_by_id(id)
-    qbo = Qbo.first
+    EmployeeSyncJob.perform_later(id: id)
-    employee = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.fetch_by_id(id)
   end
   
-    return unless employee
-    employee = find_or_create_by(id: employee.id)
-    employee.name = employee.display_name
-    employee.id = employee.id
-    employee.save!
-  end
 end

app/models/estimate.rb

@@ -10,120 +10,43 @@
 
 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
 
-  # sync all estimates
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
-  def self.sync
+  def self.last_sync
-    logger.info "Syncing ALL estimates"
+    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
-    qbo = Qbo.first
+    format_time(maximum(:updated_at))
-    estimates = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.all
   end
 
-    return unless estimates
+  # returns a human readable string
+  def to_s
+    return self[:doc_number]
+  end
   
-    estimates.each { |estimate|
+  # sync all estimates
-      process_estimate(estimate)
+  def self.sync
-    }
+    EstimateSyncJob.perform_later(full_sync: false)
-
-    #remove deleted estimates
-    where.not(estimates.map(&:id)).destroy_all
   end
   
   # sync only one estimate
   def self.sync_by_id(id)
-    logger.info "Syncing estimate #{id}"
+    EstimateSyncJob.perform_later(id: id)
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-      process_estimate(service.fetch_by_id(id))
-    end
   end
 
   # sync only one estimate
   def self.sync_by_doc_number(number)
-    logger.info "Syncing estimate by doc number #{number}"
+    EstimateSyncJob.perform_later(doc_number: number)
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-      process_estimate(service.find_by( :doc_number, number).first)
-    end
-  end
-  
-  # update an estimate
-  def self.update(id)
-    # Update the item table
-    qbo = Qbo.first
-    estimate = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.fetch_by_id(id)
-    end
-
-    return unless estimate
-
-    e = find_or_create_by(id: id)
-    e.doc_number = estimate.doc_number
-    e.txn_date = estimate.txn_date
-    e.save!
-  end
-  
-  # process an estimate into the database
-  def self.process_estimate(qbo_estimate)
-    logger.info "Processing estimate #{qbo_estimate.id}"
-    estimate = find_or_create_by(id: qbo_estimate.id)
-    estimate.doc_number = qbo_estimate.doc_number
-    estimate.customer_id = qbo_estimate.customer_ref.value
-    estimate.id = qbo_estimate.id
-    estimate.txn_date = qbo_estimate.txn_date
-    estimate.save!
-  end
-
-  # download the pdf from quickbooks
-  def pdf
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-      estimate = service.fetch_by_id(id)
-      service.pdf(estimate)
-    end
-  end
-
-  # Magic Method
-  # Maps Get/Set methods to QBO estimate object
-  def method_missing(sym, *arguments)
-    # Check to see if the method exists
-    if Quickbooks::Model::Estimate.method_defined?(sym)
-      # download details if required
-      pull unless @details
-      method_name = sym.to_s
-      # Setter
-      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])
-      # Getter
-      else
-        return @details.method(method_name).call 
-      end
-    end
   end
 
   private
 
-  # pull the details
+  def log(msg)
-  def pull
+    Rails.logger.info "[Estimate] #{msg}"
-    begin
-      raise Exception unless self.id
-      qbo = Qbo.first
-      @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-        service(:estimate).fetch_by_id(self.id)
-      end
-    rescue Exception => e
-      @details = Quickbooks::Model::Estimate.new
-    end
   end
   
 end

app/models/invoice.rb

@@ -10,194 +10,35 @@
 
 class Invoice < ActiveRecord::Base
 
+  include Redmine::I18n
+
   has_and_belongs_to_many :issues
   belongs_to :customer
-  validates_presence_of :doc_number, :id, :customer_id, :txn_date
+
+  validates :id, presence: true, uniqueness: true
+  validates :doc_number, :txn_date, presence: true
+
   self.primary_key = :id
 
-  # sync ALL the invoices
+  # 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
-    logger.info "Syncing all invoices"
+    InvoiceSyncJob.perform_later(full_sync: true)
-    last = Qbo.first.last_sync
-
-    query = "SELECT Id, DocNumber FROM Invoice"
-    query << " WHERE Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
-  
-    # TODO actually do something with the above query
-    # .all() is never called since count is never initialized
-    qbo = Qbo.first
-    invoices = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-      service.all 
   end
 
-    return unless invoices
+  # Sync a single invoice by ID, typically triggered by a webhook notification or manual sync request
-     
-    invoices.each { | invoice | 
-      process_invoice invoice
-    }
-  end
-  
-  #sync by invoice ID
   def self.sync_by_id(id)
-    logger.info "Syncing invoice #{id}"
+    InvoiceSyncJob.perform_later(id: id)
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-      invoice = service.fetch_by_id(id) 
-      process_invoice invoice
-    end
-  end
-  
-  private
-  
-  # Attach the invoice to the issue
-  def self.attach_to_issue(issue, invoice)
-    return if issue.nil?
-    
-    # skip this issue if the issue customer is not the same as the invoice customer
-    return if issue.customer_id != invoice.customer_ref.value.to_i
-    
-    logger.info "Attaching invoice #{invoice.id} to issue #{issue.id}"
-    
-    invoice = Invoice.find_or_create_by(id: invoice.id)
-
-    unless issue.invoices.include?(invoice)
-      issue.invoices << invoice
-      issue.save!
-    end
-    
-    compare_custom_fields(issue, invoice)
-  end
-  
-  # processes the invoice into the database
-  def self.process_invoice(i)
-    logger.info "Processing invoice #{i.id}"
-
-    # Load the invoice into the database
-    invoice = Invoice.find_or_create_by(id: i.id)
-    invoice.doc_number = i.doc_number 
-    invoice.id = i.id
-    invoice.customer_id = i.customer_ref
-    invoice.txn_date = i.txn_date
-    invoice.save!
-
-    # Scan the private notes for hashtags and attach to the applicable issues
-    if not i.private_note.nil?
-      i.private_note.scan(/#(\w+)/).flatten.each { |issue|
-        attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
-      }
-    end
-    
-    # Scan the line items for hashtags and attach to the applicable issues
-    i.line_items.each { |line|
-      if line.description
-        line.description.scan(/#(\w+)/).flatten.each { |issue|
-          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
-        }
-      end
-    }
-  end
-  
-  # compares the custome fields on invoices & issues and updates the invoice as needed
-  #
-  # the issue here is when two or more issues share an invoice with the same custom field, but diffrent values
-  # this condions causes an infinite loop as the webhook is called when an invoice is updated
-  # TODO maybe add a cf_sync_confict flag to invoices
-  def self.compare_custom_fields(issue, invoice)
-    logger.info "Comparing custom fields"
-    # TODO break if Invoice.find(invoice.id).cf_sync_confict
-    is_changed = false
-
-    logger.debug "Calling :process_invoice_custom_fields hook"
-    context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
-
-    # Process updates from the hooks
-    context.each do |c|
-      unless c.nil?
-        logger.debug "Invoice.compare_custom_fields: We have a responce from a hook"
-        push_updates  c[:invoice] if c[:is_changed]
-      end
-    end
-      
-    # Process Issue Custom Values
-    begin
-      value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
-      
-      # Check to see if the value is blank...
-      if not value.value.to_s.blank?
-        # Check to see if the value is diffrent
-        if not cf.string_value.to_s.eql? value.value.to_s
-          # update the custom field on the invoice
-          cf.string_value = value.value.to_s
-          is_changed = true
-        end
-      end
-    rescue
-      # Nothing to do here, there is no match
-    end
-
-    push_updates invoice if is_changed
-  end
-
-  # pushes invoice updates
-  def self.push_updates(invoice)
-    begin
-      logger.info "Invoice.push_updates"
-      qbo = Qbo.first
-      qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-        service.update invoice
-      end
-    rescue
-      # Do nothing, probaly custome field sync confict on the invoice. 
-      # This is a problem with how it's billed
-      # TODO Add notes in memo area
-      # TODO flag Invoice.cf_sync_confict here
-      logger.error "Failed to update invoice"
-    end
-  end
-
-  # download the pdf from quickbooks
-  def pdf
-    qbo = Qbo.first
-    qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-      invoice = service.fetch_by_id(id)
-      return service.pdf(invoice)
-    end
-  end
-
-  # Magic Method
-  # Maps Get/Set methods to QBO invoice object
-  def method_missing(sym, *arguments)
-    # Check to see if the method exists
-    if Quickbooks::Model::Invoice.method_defined?(sym)
-      # download details if required
-      pull unless @details
-      method_name = sym.to_s
-      # Setter
-      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])
-      # Getter
-      else
-        return @details.method(method_name).call 
-      end
-    end
-  end
-  
-  # pull the details from quickbooks
-  def pull
-    begin
-      raise Exception unless self.id
-      qbo = Qbo.first
-      @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-        service.fetch_by_id(self.id)
-      end
-    rescue Exception => e
-      @details = Quickbooks::Model::Invoice.new
-    end
   end
 
 end

app/models/qbo.rb

@@ -13,16 +13,34 @@ class Qbo < ActiveRecord::Base
   include QuickbooksOauth
   include Redmine::I18n
 
+  validate :single_record_only, on: :create
+  
   # Updates last sync time stamp
   def self.update_time_stamp
     date = DateTime.now
-    logger.info "Updating QBO timestamp to #{date}"
+    log "Updating QBO timestamp to #{date}"
-    qbo = Qbo.first
+    qbo = QboConnectionService.current!
     qbo.last_sync = date
     qbo.save
   end
   
+  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
   def self.last_sync
-    format_time(Qbo.first.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.
+  def self.log(msg)
+    logger.info "[QBO] #{msg}"
+  end
+
+  # Validates that only one QBO connection record exists in the database. Adds an error if a record already exists.
+  def single_record_only
+    errors.add(:base, "Only one QBO connection allowed") if Qbo.exists?
+  end
+
 end

app/services/customer_service.rb

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

app/services/customer_sync_service.rb

@@ -0,0 +1,32 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class CustomerSyncService < SyncServiceBase
+
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Customer
+  end
+
+  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    !remote.active?
+  end
+
+  # Map relevant attributes from the QBO Customer to the local Customer model
+  def process_attributes(local, remote)
+    local.name = remote.display_name
+    local.phone_number = remote.primary_phone&.free_form_number&.gsub(/\D/, '')
+    local.mobile_phone_number = remote.mobile_phone&.free_form_number&.gsub(/\D/, '')
+  end
+
+end

app/services/employee_sync_service.rb

@@ -8,18 +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.
 
-module Hooks
+class EmployeeSyncService < SyncServiceBase
 
-  class ViewLayoutsHookListener < Redmine::Hook::ViewListener
+  private
 
-    # Load the javascript to support the autocomplete forms
+  # Specify the local model this service syncs
-    def view_layouts_base_html_head(context = {})
+  def self.model_class
-      js = javascript_include_tag 'application.js', :plugin => 'redmine_qbo'
+    Employee
-      js += javascript_include_tag 'autocomplete-rails.js', :plugin => 'redmine_qbo'
-      js += javascript_include_tag 'checkbox_controller.js', :plugin => 'redmine_qbo'
-      return js
   end
 
+  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    !remote.active?
+  end
+
+  # Map relevant attributes from the QBO Employee to the local Employee model
+  def process_attributes(local, remote)
+    local.name = remote.display_name
   end
 
 end

app/services/estimate_pdf_service.rb

@@ -7,13 +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 EstimatePdfService < PdfServiceBase
 
-module Hooks
+  def self.model_class
-
+    Estimate
-  class ViewHookListener < Redmine::Hook::ViewListener
-
-    render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
-    
   end
 
 end

app/services/estimate_sync_service.rb

@@ -8,12 +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.
 
-module Hooks
+class EstimateSyncService < SyncServiceBase
   
-  class HeaderFooterHookListener < Redmine::Hook::ViewListener
+  private
-    def view_layouts_base_body_bottom(context = {})
+
-      return "<div id='footer' align='center'><b>#{I18n.translate(:label_last_sync)}: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
+  # Specify the local model this service syncs
+  def self.model_class
+    Estimate
   end
+
+  # Map relevant attributes from the QBO Estimate to the local Estimate model
+  def process_attributes(local, remote)
+    local.doc_number = remote.doc_number
+    local.txn_date = remote.txn_date
+    local.customer = Customer.find_by(id: remote.customer_ref&.value)
   end
 
 end

app/services/invoice_attachment_service.rb

@@ -0,0 +1,62 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class InvoiceAttachmentService
+
+  def initialize(invoice, remote)
+    @invoice = invoice
+    @remote  = remote
+  end
+
+  # Attach invoice to issues based on issue IDs found in the invoice's private note and line descriptions
+  def attach
+    extract_issue_ids.each do |issue_id|
+      log "Processing issue ##{issue_id} for invoice ##{@invoice.doc_number}"
+      
+      issue = Issue.find_by(id: issue_id)
+      next unless issue
+      next unless issue.customer&.id == @invoice.customer&.id
+
+      unless issue.invoices.exists?(@invoice.id)
+        issue.invoices << @invoice
+        issue.save! if issue.changed?
+        log "Attached invoice ##{@invoice.id} to issue ##{issue.id}"
+      end
+
+      InvoiceCustomFieldSyncService.new(issue, @invoice, @remote).sync
+    end
+  end
+
+  private
+
+  # Extract issue IDs from the invoice's private note and line descriptions
+  def extract_issue_ids
+    ids = []
+
+    if @remote.private_note.present?
+      ids += scan(@remote.private_note)
+    end
+
+    Array(@remote.line_items).each do |line|
+      ids += scan(line.description.to_s)
+    end
+
+    ids.uniq
+  end
+
+  # Scan text for issue IDs in the format #123
+  def scan(text)
+    text.scan(/#(\d+)/).flatten.map(&:to_i)
+  end
+
+  def log(msg)
+    Rails.logger.info "[InvoiceAttachmentService] #{msg}"
+  end
+end

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

app/services/invoice_pdf_service.rb

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

app/services/invoice_push_service.rb

@@ -0,0 +1,47 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class InvoicePushService
+  
+  def initialize(invoice)
+    @invoice = invoice
+  end
+
+  # Push invoice changes to QBO if the invoice is linked to any issues with custom field changes that need to be synced
+  def push
+    return if @invoice.qbo_sync_locked?
+
+    log "Pushing invoice ##{@invoice.id} to QBO due to linked issue custom field changes"
+
+    @invoice.update_column(:qbo_sync_locked, true)
+
+    qbo = 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
+
+  private
+
+  def log(msg)
+    Rails.logger.info "[InvoicePushService] #{msg}"
+  end
+end

app/services/invoice_sync_service.rb

@@ -0,0 +1,35 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class InvoiceSyncService < SyncServiceBase
+  
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Invoice
+  end
+  
+  # Map relevant attributes from the QBO Invoice to the local Invoice model
+  def process_attributes(local, remote)
+    local.doc_number      = remote.doc_number
+    local.txn_date        = remote.txn_date
+    local.due_date        = remote.due_date
+    local.total_amount    = remote.total
+    local.balance         = remote.balance
+    local.qbo_updated_at  = remote.meta_data&.last_updated_time
+    local.customer = Customer.find_by(id: remote.customer_ref&.value)
+  end
+
+  # Attach QBO Invoices to the local Issues
+  def attach_documents(local, remote)
+    InvoiceAttachmentService.new(local, remote).attach
+  end
+end

app/services/pdf_service_base.rb

@@ -0,0 +1,66 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class PdfServiceBase
+  
+  require 'combine_pdf'
+
+  # Subclasses should initialize with a QBO client instance
+  def initialize(qbo:)
+    @qbo = qbo
+    @entity = self.class.model_class
+  end
+
+  # Subclasses must implement this to specify which document model to download pdf (e.g. Estimate, Invoice)
+  def self.model_class
+    raise NotImplementedError
+  end
+
+  # Fetches the PDF for the given entity IDs. If multiple IDs are provided, their PDFs are combined into a single document.
+  def fetch_pdf(doc_ids:)
+    log "Fetching PDFs for #{@entity} IDs: #{doc_ids.join(', ')}"
+    @qbo.perform_authenticated_request do |access_token|
+      service_class = "Quickbooks::Service::#{@entity.name}".constantize
+      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
+      
+      return single_pdf(service, doc_ids.first) if doc_ids.size == 1
+
+      combined_pdf(service, doc_ids)
+    end
+  end
+
+  private
+
+  # Fetches a single PDF for the given invoice ID.
+  def single_pdf(service, id)
+    log "Fetching PDF for #{@entity} ID: #{id}"
+    entity = service.fetch_by_id(id)
+    [service.pdf(entity), entity.doc_number]
+  end
+
+  # Combines PDFs for multiple entity IDs into a single PDF document and returns it along with a reference string.
+  def combined_pdf(service, ids)
+    log "Combining PDFs for #{@entity} IDs: #{ids.join(', ')}"
+    pdf = CombinePDF.new
+    ref = []
+
+    ids.each do |id|
+      entity = service.fetch_by_id(id)
+      ref << entity.doc_number
+      pdf << CombinePDF.parse(service.pdf(entity))
+    end
+
+    [pdf.to_pdf, ref.join(" ")]
+  end
+
+  # Logs messages with a consistent prefix for easier debugging.
+  def log(msg)
+    Rails.logger.info "[#{@entity}PdfService] #{msg}"
+  end
+end

app/services/qbo_connection_service.rb

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

app/services/qbo_oauth_service.rb

@@ -0,0 +1,33 @@
+#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 QboOauthService
+
+  # 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,
+      response_type: "code",
+      state: SecureRandom.hex(12),
+      scope: "com.intuit.quickbooks.accounting"
+    )
+  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.
+  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 )
+  end
+
+  # Constructs and returns an OAuth2 client instance configured with the application's credentials and settings.
+  def self.client
+    Qbo.construct_oauth2_client
+  end
+end

app/services/sync_service_base.rb

@@ -0,0 +1,127 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class SyncServiceBase
+  PAGE_SIZE = 1000
+
+  # Subclasses should initialize with a QBO client instance
+  def initialize(qbo:)
+    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)
+  def self.model_class
+    raise NotImplementedError
+  end
+
+  # Sync all entities, or only those updated since the last sync
+  def sync(full_sync: false)
+    log "Starting #{full_sync ? 'full' : 'incremental'} #{@entity.name} sync with page size of: #{@page_size}"
+
+    @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)
+
+      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
+      end
+    end
+
+    log "#{@entity.name} sync complete"
+  end
+
+  # Sync a single entity by its QBO ID (webhook usage)
+  def sync_by_id(id)
+    log "Syncing #{@entity.name} with ID #{id}"
+
+    @qbo.perform_authenticated_request do |access_token|
+      service_class = "Quickbooks::Service::#{@entity.name}".constantize
+      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
+
+      remote = service.fetch_by_id(id)
+      persist(remote)
+    end
+  end
+
+  private
+
+  # 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
+
+  def attach_documents(local, remote)
+    # Override in subclasses if the entity has attachments (e.g. Invoice)
+  end
+
+  # Determine if a remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_remote?(remote)
+    false
+  end
+
+  # Log messages with the entity type for better traceability
+  def log(msg)
+    Rails.logger.info "[#{@entity.name}SyncService] #{msg}"
+  end
+
+  # Create or update a local entity record based on the QBO remote data
+  def persist(remote)
+    local = @entity.find_or_initialize_by(id: remote.id)
+
+    if destroy_remote?(remote)
+      if local.persisted?
+        local.destroy
+        log "Deleted #{@entity.name} #{remote.id}"
+      end
+      return
+    end
+
+    process_attributes(local, remote)
+
+    if local.changed?
+      local.save!
+      log "Updated #{@entity.name} #{remote.id}"
+      attach_documents(local, remote)
+    end
+
+  rescue => e
+    log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
+  end
+
+  # This method should be implemented in subclasses to map remote attributes to local model
+  def process_attributes(local, remote)
+    raise NotImplementedError, "Subclasses must implement process_attributes"
+  end
+end

app/views/customers/_actions.html.erb

@@ -1,4 +1,4 @@
-<%= link_to t(:label_appointment), "https://calendar.google.com/calendar/render?action=TEMPLATE&text=#{@customer.name}+-&details=#{ link_to "Customer Details", "https://#{Setting.host_name}#{customer_path @customer.id}"}%0A#{@customer.primary_phone}&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank %>
+<%= link_to t(:label_appointment), "https://calendar.google.com/calendar/render?action=TEMPLATE&text=#{@customer.name}+-&details=#{ link_to t(:customer_details), "https://#{Setting.host_name}#{customer_path @customer.id}"}%0A#{@customer.primary_phone}%3Cbr/%3E+&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank, id: :appointment_link %>
 
 <br/>
 <br/>

app/views/customers/_details.html.erb

@@ -13,22 +13,22 @@
     
     <tr>
       <th><%=t(:label_primary_phone)%></th>
-      <td><%= number_to_phone(customer.primary_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.primary_phone %></td>
+      <td><%= number_to_phone(customer&.primary_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td>
     </tr>
     
     <tr>
       <th><%=t(:label_mobile_phone)%></th>
-      <td><%= number_to_phone(customer.mobile_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.mobile_phone %></td>
+      <td><%= number_to_phone(customer&.mobile_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td>
     </tr>
     
      <tr>
         <th><%=t(:label_billing_address)%></th>
-        <td><%= @billing_address %></td>
+        <td><pre><%= @billing_address %></pre></td>
     </tr>
     
      <tr>
         <th><%=t(:label_shipping_address)%></th>
-        <td><%= @shipping_address %></td>
+        <td><pre><%= @shipping_address %></pre></td>
     </tr>
     
     <tr>

app/views/customers/_form.html.erb

@@ -7,28 +7,28 @@
         <div class="clearfix">
           <%=t(:label_display_name)%> 
           <div class="input">
-            <%= f.text_field :name, :required => true, :autocomplete => "off" %>
+            <%= f.text_field :name, required: true, autocomplete: "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_primary_phone)%>
           <div class="input">
-            <%= f.telephone_field :primary_phone, :autocomplete => "off" %>
+            <%= f.telephone_field :primary_phone, autocomplete: "off" %>
           </div>
         </div>
         
        <div class="clearfix">
           <%=t(:label_mobile_phone)%>:
           <div class="input">
-            <%= f.telephone_field :mobile_phone, :autocomplete => "off" %>
+            <%= f.telephone_field :mobile_phone, autocomplete: "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_email)%>:
           <div class="input">
-            <%= f.email_field :email, :autocomplete => "off" %>
+            <%= f.email_field :email, autocomplete: "off" %>
           </div>
         </div>
         
@@ -36,16 +36,16 @@
           <%=t(:field_notes)%>: 
           <div class="input">
             <p>  
-              <%= content_tag 'span', :id => "issue_description_and_toolbar" do %>
+              <%= content_tag :span, id: "issue_description_and_toolbar" do %>
               <%= f.text_area :notes,
-                    :cols => 60,
+                    cols: 60,
-                    :rows => 10,
+                    rows: 10,
-                    :accesskey => accesskey(:edit),
+                    accesskey: accesskey(:edit),
-                    :class => 'wiki-edit',
+                    class: 'wiki-edit',
-                    :no_label => true %>
+                    no_label: true %>
               <% end %>
             </p>
-            <%= wikitoolbar_for 'issue_description' %>
+            <%= wikitoolbar_for :issue_description %>
           </div>
         </div>
         

app/views/customers/_search.html.erb

@@ -1,5 +1,5 @@
-<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
+<%= form_tag(customers_path, method: "get", id: "customer-search-form") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+    <%= 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%>

app/views/customers/_sidebar.html.erb

@@ -1,2 +1,2 @@
 <h3><%=t(:label_customers)%></h3>
-<%= render :partial => 'customers/search' %>
+<%= render partial: 'customers/search' %>

app/views/customers/edit.html.erb

@@ -1,3 +1,3 @@
 <h1><%=t(:label_edit_customer)%></h1> 
 <br/> 
-<%= render :partial => 'customers/form' %>
+<%= render partial: 'customers/form' %>

app/views/customers/filter_estimates_by_customer.js.erb

@@ -1 +1 @@
-$('select#issue_estimate_id').html('<%= j content_tag(:option,'',:value=>"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');
+$('select#issue_estimate_id').html('<%= j content_tag(:option,'',value:"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');

app/views/customers/index.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_customers)%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<h2><%=t(:field_customers)%> <span style="float:right"> <%= render partial: 'customers/search' %> </span> </h2>
 <% if @customers.present? %>
   <br/>
   <% @customers.each do |c| %>
@@ -20,5 +20,5 @@
 <% end %>
 
 <div>
-  <%= render :partial => 'qbo/stats' %>
+  <%= render partial: 'qbo/stats' %>
 </div>

app/views/customers/new.html.erb

@@ -1,3 +1,3 @@
 <h2><%=t(:label_new_customer)%></h2> 
 <br/>
-<%= render :partial => 'customers/form' %>
+<%= render partial: 'customers/form' %>

app/views/customers/show.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo['sandbox'] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo[:sandbox] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
   <div class="issue">
 
     <div class="splitcontent">
@@ -12,12 +12,12 @@
         <div class="splitcontent">
           <div class="splitcontentleft">
             <h4><%=t(:field_customer)%>:</h4>
-            <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+            <%= render partial: 'customers/details', locals: {customer: @customer} %>
           </div>
 
           <div class="splitcontentleft">
             <h4><%=t(:label_actions)%>:</h4>
-            <%= render :partial => 'customers/actions', locals: {customer: @customer} %>
+            <%= render partial: 'customers/actions', locals: {customer: @customer} %>
           </div>
         </div>
 
@@ -27,12 +27,12 @@
         <div class="splitcontent">
           <div class="splitcontentleft">
             <h4><%=t(:estimates)%>:</h4>
-            <%= render :partial => 'estimates/list', locals: {customer: @customer} %>
+            <%= render partial: 'estimates/list', locals: {estimates: @customer.estimates} %>
           </div>
 
           <div class="splitcontentleft">
             <h4><%=t(:label_invoices)%>:</h4>
-            <%= render :partial => 'invoices/list', locals: {customer: @customer} %>
+            <%= render partial: 'invoices/list', locals: {invoices: @customer.invoices} %>
           </div>
         </div>
 
@@ -46,8 +46,8 @@
   </div>
 
 <br/>
-<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
+<h3><%=@open_issues.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+<%= render partial: 'issues/list_simple', locals: {issues: @open_issues.open} %>
 
 <h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%> - <%= @closed_hours.round(1)%> <%=t(:label_hours)%></h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
+<%= render partial: 'issues/list_simple', locals: {issues: @closed_issues} %>

app/views/customers/view.html.erb

@@ -4,7 +4,7 @@
 
 <div class="<%= @issue.css_classes %> details">
 
-<%= avatar(@issue.author, :size => "50") %>
+<%= avatar(@issue.author, size: "50") %>
 
 <div class="subject">
 <%= render_issue_subject_with_tree(@issue) %>
@@ -19,39 +19,39 @@
 
 <div class="attributes">
 <%= issue_fields_rows do |rows|
-  rows.left l(:field_status), @issue.status.name, :class => 'status'
+  rows.left l(:field_status), @issue.status.name, class: :status
-  rows.left l(:field_priority), @issue.priority.name, :class => 'priority'
+  rows.left l(:field_priority), @issue.priority.name, class: :priority
-  unless @issue.disabled_core_fields.include?('assigned_to_id')
+  # unless @issue.disabled_core_fields.include?(:assigned_to_id)
-    rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? @issue.assigned_to : "-"), :class => 'assigned-to'
+  #   rows.left l(:field_assigned_to), avatar(@issue.assigned_to, size: "14").to_s.html_safe + (@issue.assigned_to ? @issue.assigned_to : "-"), class: 'assigned-to'
+  # end
+  unless @issue.disabled_core_fields.include?(:category_id) || (@issue.category.nil? && @issue.project.issue_categories.none?)
+    rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), class: :category
   end
-  unless @issue.disabled_core_fields.include?('category_id') || (@issue.category.nil? && @issue.project.issue_categories.none?)
+  unless @issue.disabled_core_fields.include?(:fixed_version_id) || (@issue.fixed_version.nil? && @issue.assignable_versions.none?)
-    rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category'
+    rows.left l(:field_fixed_version), (@issue.fixed_version ? @issue.fixed_version : "-"), class: 'fixed-version'
   end
-  unless @issue.disabled_core_fields.include?('fixed_version_id') || (@issue.fixed_version.nil? && @issue.assignable_versions.none?)
+  unless @issue.disabled_core_fields.include?(:start_date)
-    rows.left l(:field_fixed_version), (@issue.fixed_version ? @issue.fixed_version : "-"), :class => 'fixed-version'
+    rows.right l(:field_start_date), format_date(@issue.start_date), class: 'start-date'
   end
-  unless @issue.disabled_core_fields.include?('start_date')
+  unless @issue.disabled_core_fields.include?(:due_date)
-    rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
+    rows.right l(:field_due_date), format_date(@issue.due_date), class: 'due-date'
   end
-  unless @issue.disabled_core_fields.include?('due_date')
+  unless @issue.disabled_core_fields.include?(:done_ratio)
-    rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
+    rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, legend: "#{@issue.done_ratio}%"), class: :progress
   end
-  unless @issue.disabled_core_fields.include?('done_ratio')
+  unless @issue.disabled_core_fields.include?(:estimated_hours)
-    rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :legend => "#{@issue.done_ratio}%"), :class => 'progress'
-  end
-  unless @issue.disabled_core_fields.include?('estimated_hours')
     if @issue.estimated_hours.present? || @issue.total_estimated_hours.to_f > 0
-      rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
+      rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), class: 'estimated-hours'
     end
   end
   #if User.current.allowed_to_view_all_time_entries?(@project)
     if @issue.total_spent_hours > 0
-      rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
+      rows.right l(:label_spent_time), issue_spent_hours_details(@issue), class: 'spent-time'
     end
   #end
 end %>
 <%= render_full_width_custom_fields_rows(@issue) %>
-<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+<%= call_hook(:view_issues_show_details_bottom, issue: @issue) %>
 </div>
 
 <% if @issue.description? || @issue.attachments.any? -%>
@@ -59,19 +59,19 @@ end %>
 <% if @issue.description? %>
 <div class="description">
   <div class="contextual">
-  <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if @issue.notes_addable? %>
+  <%= link_to l(:button_quote), quoted_issue_path(@issue), remote: true, method: :post, class: 'icon icon-comment' if @issue.notes_addable? %>
   </div>
 
   <p><strong><%=l(:field_description)%></strong></p>
   <div class="wiki">
-  <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+  <%= textilizable @issue, :description, attachments: @issue.attachments %>
   </div>
 </div>
 <% end %>
-<%= link_to_attachments @issue, :thumbnails => true %>
+<%= link_to_attachments @issue, thumbnails: true %>
 <% end -%>
 
-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+<%= call_hook(:view_issues_show_description_bottom, issue: @issue) %>
 
 <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
 <hr />
@@ -87,7 +87,7 @@ end %>
 <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
 <hr />
 <div id="relations">
-<%= render :partial => 'issues/relations' %>
+<%= render partial: 'issues/relations' %>
 </div>
 <% end %>
 
@@ -96,14 +96,14 @@ end %>
 <% if @changesets.present? %>
 <div id="issue-changesets">
 <h3><%=l(:label_associated_revisions)%></h3>
-<%= render :partial => 'issues/changesets', :locals => { :changesets => @changesets} %>
+<%= render partial: 'issues/changesets', locals: { changesets: @changesets} %>
 </div>
 <% end %>
 
 <% if @journals.present? %>
 <div id="history">
 <h3><%=l(:label_history)%></h3>
-<%= render :partial => 'issues/history', :locals => { :issue => @issue, :journals => @journals } %>
+<%= render partial: 'issues/history', locals: { issue: @issue, journals: @journals } %>
 </div>
 <% end %>
 

app/views/estimates/_list.html.erb

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

app/views/estimates/_search.html.erb

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

app/views/estimates/_sidebar.html.erb

@@ -1,2 +1,2 @@
 <h3><%=t(:label_estimates) %></h3>
-<%= render :partial => 'estimates/search' %>
+<%= render partial: 'estimates/search' %>

app/views/invoices/_list.html.erb

@@ -1,24 +1,23 @@
-<% if @customer.present? %>
+<% unless invoices.empty? %>
 
   <%= form_with(url: invoice_path, method: :get) do |form| %>
 
-    <% if @customer.invoices.count > 1 %>
+    <% if invoices.count > 1 %>
       <div class="form-check">
         <%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
         <%= label_tag "select-all-invoices", t(:label_select_all) %>
       </div>
-
       <hr>
     <% end %>
 
-    <% @customer.invoices.order(id: :desc).each do |invoice| %>
+    <% invoices.sort.reverse.each do |invoice| %>
       <div class="row">
-        <%= check_box_tag "invoice_ids[]", invoice.id, false, class: "invoice-checkbox"  %>
+        <%= check_box_tag "invoice_ids[]", invoice.id, false,  onchange: "updateLink()", data: { url: invoice_path(invoice), text: "Invoice ##{invoice.to_s}" }, class: "invoice-checkbox appointment" if invoices.count > 1 %>
         <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
       </div>
     <% end %>
 
-    <% if @customer.invoices.count > 1 %>
+    <% if invoices.count > 1 %>
       <%= form.submit t(:button_bulk_pdf) %>
     <% end %>
   <% end %>

app/views/issues/_history.html.erb

@@ -3,12 +3,12 @@
   <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
     <div id="note-<%= journal.indice %>">
     <div class="contextual">
-      <span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span>
+      <span class="journal-actions"><%= render_journal_actions(issue, journal, reply_links: reply_links) %></span>
       <a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>
     </div>
     <h4>
-      <%= avatar(journal.user, :size => "24") %>
+      <%= avatar(journal.user, size: "24") %>
-      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+      <%= authoring journal.created_on, journal.user, label: :label_updated_time_by %>
       <%= render_private_notes_indicator(journal) %>
     </h4>
 
@@ -26,10 +26,10 @@
       </div>
     <% end %>
     <% end %>
-    <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
+    <%= render_notes(issue, journal, reply_links: reply_links) unless journal.notes.blank? %>
     </div>
   </div>
-  <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
+  <%= call_hook(:view_issues_history_journal_bottom, { journal: journal }) %>
 <% end %>
 
 <% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>

app/views/issues/_list_simple.html.erb

@@ -9,9 +9,9 @@
     </tr></thead>
     <tbody>
     <% for issue in issues %>
-    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle(:odd, :even) %> <%= issue.css_classes %>">
       <td class="id">
-        <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
+        <%= check_box_tag("ids[]", issue.id, false, style: 'display:none;', id: nil) %>
         <%= link_to(issue.id, issue_path(issue)) %>
       </td>
       <td class="project"><%= link_to_project(issue.project) %></td>

app/views/qbo/_footer.html.erb

@@ -0,0 +1,3 @@
+<div id='footer' align='center'>
+     <%= render partial: 'qbo/last_sync' %>
+</div>

app/views/qbo/_last_sync.html.erb

@@ -1 +1 @@
-<b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>
+<b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync %>

app/views/qbo/_settings.html.erb

@@ -60,18 +60,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     <tr>
       <th><%=t(:label_sandbox)%></th>
       <td>
-        <%= check_box_tag 'settings[sandbox]', @settings['sandbox'], @settings['sandbox'] %>
+        <%= check_box_tag 'settings[sandbox]', @settings[:sandbox], @settings[:sandbox] %>
       </td>
     </tr>
 
      <tr>
         <th><%=t(:label_oauth_expires)%></th>
-        <td><%= if Qbo.exists? then Qbo.first.oauth2_access_token_expires_at end %>
+        <td><%= QboConnectionService.current!&.oauth2_access_token_expires_at %>
       </tr>
       
       <tr>
         <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
-        <td><%= if Qbo.exists? then Qbo.first.oauth2_refresh_token_expires_at end %>
+        <td><%= QboConnectionService.current!&.oauth2_refresh_token_expires_at %>
      </tr>
 
   </tbody>
@@ -89,19 +89,19 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 <br/>
 
 <div>
-    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%> @ <%= Customer.last_sync %>
     </div>
       
     <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %> @ <%= Employee.last_sync %>
     </div>
     
     <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %> @ <%= Invoice.last_sync%>
     </div>
     
     <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %>
+        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %> @ <%= Estimate.last_sync %>
     </div>
       
     <br/>

app/views/qbo/_sidebar.html.erb

@@ -1,6 +1,6 @@
 <% if User.current.logged? %>
 
-    <%= render :partial => 'customers/sidebar' %>
+    <%= render partial: 'customers/sidebar' %>
-    <%= render :partial => 'estimates/sidebar' %>
+    <%= render partial: 'estimates/sidebar' %>
 
 <% end %>

app/views/qbo/_stats.html.erb

@@ -1 +1 @@
-<%= Customer.count %> <%=t(:field_customers)%> - <%= render :partial => 'qbo/last_sync' %>
+<%= Customer.count %> <%=t(:field_customers)%> - <%= render partial: 'qbo/last_sync' %>

assets/javascripts/application.js

@@ -1,11 +1,20 @@
-$(function() {
+function updateLink() {
-  $("input#issue_customer_id").on("change", function() {
+  console.log("updateLink called");
+  const linkElement = document.getElementById("appointment_link");
+  const regex = /((?:<br\/>|%3Cbr\/?%3E))([\s\S]*?)(&dates)/gi;
+  linkElement.href = linkElement.href.replace(regex, `$1${getSelectedDocs()}$3`);
+}
 
-    $.ajax({
+function getSelectedDocs() {
-      url: "/filter_estimates_by_customer",
+  const appointent_extras = document.querySelectorAll('.appointment');
-      type: "GET",
-      data: { selected_customer: $("input#issue_customer_id").val() }
-    });
-  });
 
-});
+  let output = '';
+  for (const item of appointent_extras) {
+    if (item.checked) {
+      console.log(`Checked item: ${item.dataset.text} with URL: ${item.dataset.url}`);
+      output += `%0A`+ encodeURIComponent(`<a href="${window.location.origin}${item.dataset.url}">${item.dataset.text}</a>`) +`%0A`;
+    }
+  }
+  
+  return output;
+}

config/locales/en.yml

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

config/routes.rb

@@ -9,31 +9,31 @@
 #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.
 
 #authentication
-get 'qbo/authenticate', :to => 'qbo#authenticate'
+get 'qbo/authenticate', to: 'qbo#authenticate'
-get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
+get 'qbo/oauth_callback', to: 'qbo#oauth_callback'
 
 #manual sync
-get 'qbo/sync', :to => 'qbo#sync'
+get 'qbo/sync', to: 'qbo#sync'
 
 #webhook
-post 'qbo/webhook', :to => 'qbo#webhook'
+post 'qbo/webhook', to: 'qbo#webhook'
 
 # Estimate & Invoice PDF
-get 'estimates/:id', :to => 'estimate#show', as: :estimate
+get 'estimates/:id', to: 'estimate#show', as: :estimate
-get 'estimates/doc/', :to => 'estimate#doc', as: :estimate_doc
+get 'estimates/doc/', to: 'estimate#doc', as: :estimate_doc
-get 'invoices/:id', :to => 'invoice#show', as: :invoice
+get 'invoices/:id', to: 'invoice#show', as: :invoice
 
 #manual billing
-get 'bill/:id', :to => 'qbo#bill', as: :bill
+get 'bill/:id', to: 'qbo#bill', as: :bill
 
 #customer issue view
-get 'customers/view/:token', :to => 'customers#view', as: :view
+get 'customers/view/:token', to: 'customers#view', as: :view
-get 'customers/share/:id', :to => 'customers#share', as: :share
+get 'customers/share/:id', to: 'customers#share', as: :share
 
 #java script routes
 get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
 get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
 
 resources :customers do
-  get :autocomplete_customer_name, :on => :collection
+  get :autocomplete_customer_name, on: :collection
 end

db/migrate/002_create_qbo_customers.rb

@@ -11,7 +11,7 @@
 class CreateQboCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_customers, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/004_create_qbo_items.rb

@@ -11,7 +11,7 @@
 class CreateQboItems < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_items, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/005_create_qbo_employees.rb

@@ -11,7 +11,7 @@
 class CreateQboEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_employees, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/007_update_time_entries.rb

@@ -10,6 +10,6 @@
 
 class UpdateTimeEntries < ActiveRecord::Migration[5.1]
   def change
-    add_column :time_entries, :qbo_billed, :boolean, :default => false
+    add_column :time_entries, :qbo_billed, :boolean, default: false
   end
 end

db/migrate/008_create_qbo_estimates.rb

@@ -11,7 +11,7 @@
 class CreateQboEstimates < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_estimates, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :doc_number
     end
   end

db/migrate/011_create_qbo_invoices.rb

@@ -11,7 +11,7 @@
 class CreateQboInvoices < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_invoices, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :doc_number
     end
   end

db/migrate/013_create_qbo_purchases.rb

@@ -11,7 +11,7 @@
 class CreateQboPurchases< ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_purchases, id: false do |t| 
-      t.integer :id, :options => 'PRIMARY KEY' 
+      t.integer :id, options: 'PRIMARY KEY' 
       t.integer :line_id
       t.string :description
       t.integer :customer_id

db/migrate/021_add_issues_qbo_invoices.rb

@@ -10,12 +10,12 @@
 
 class AddIssuesQboInvoices < ActiveRecord::Migration[5.1]
   def self.up
-    create_table :issues_qbo_invoices, :id => false do |t|
+    create_table :issues_qbo_invoices, id: false do |t|
       t.references :issue
       t.references :qbo_invoice
     end
     
-    add_index :issues_qbo_invoices, [:issue_id, :qbo_invoice_id], :unique => true
+    add_index :issues_qbo_invoices, [:issue_id, :qbo_invoice_id], unique: true
     
     # Now populate it with a SQL one-liner!
     execute "insert into issues_qbo_invoices(issue_id, qbo_invoice_id) select id, qbo_invoice_id from issues"

db/migrate/032_add_txn_dates.rb

@@ -11,45 +11,8 @@
 class AddTxnDates < ActiveRecord::Migration[5.1]
 
   def change
-    begin
     add_column :qbo_invoices, :txn_date, :date
     add_column :qbo_estimates, :txn_date, :date
-
-      reversible do |direction|
-        direction.up {
-          break unless Qbo.first
-
-          QboEstimate.reset_column_information
-          QboInvoice.reset_column_information
-
-          say "Sync Estimates"
-
-          QboEstimate.sync
-
-          say "Sync Invoices"
-
-          qbo = Qbo.first
-          invoices = qbo.perform_authenticated_request do |access_token|
-            service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-            service.all
-          end
-
-          return unless invoices
-
-          invoices.each { |invoice|
-              # Load the invoice into the database
-              qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
-              qbo_invoice.doc_number = invoice.doc_number
-              qbo_invoice.id = invoice.id
-              qbo_invoice.customer_id = invoice.customer_ref
-              qbo_invoice.txn_date = invoice.txn_date
-              qbo_invoice.save!
-          }
-        }
-      end
-    rescue
-      logger.error "AddTxnDates Failed"
-    end
   end
 
 end

db/migrate/038_add_customers_timestamp.rb

@@ -8,12 +8,8 @@
 #
 #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 File.expand_path('../../test_helper', __FILE__)
+class AddCustomersTimestamp < ActiveRecord::Migration[5.1]
-
+  def change
-class QboTest < ActiveSupport::TestCase
+    add_timestamps(:customers, null: true)
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
   end
 end

db/migrate/039_add_full_text_index_to_customers.rb

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

db/migrate/040_add_doc_timestamp.rb

@@ -8,12 +8,9 @@
 #
 #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 File.expand_path('../../test_helper', __FILE__)
+class AddDocTimestamp < ActiveRecord::Migration[5.1]
-
+  def change
-class QboCustomersTest < ActiveSupport::TestCase
+    add_timestamps(:invoices, null: true)
-
+    add_timestamps(:estimates, null: true)
-  # Replace this with your real tests.
-  def test_truth
-    assert true
   end
 end

db/migrate/041_add_invoice_fields.rb

@@ -0,0 +1,24 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AddInvoiceFields < ActiveRecord::Migration[7.0]
+  def change
+    change_table :invoices, bulk: true do |t|
+      t.date     :due_date
+      t.decimal  :total_amount, precision: 15, scale: 2
+      t.decimal  :balance, precision: 15, scale: 2
+      t.datetime :qbo_updated_at
+      t.boolean  :qbo_sync_locked, null: false, default: false
+    end
+
+    add_index :invoices, :qbo_updated_at
+    add_index :invoices, :qbo_sync_locked
+  end
+end

db/migrate/042_add_employee_timestamp.rb

@@ -8,11 +8,8 @@
 #
 #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 File.expand_path('../../test_helper', __FILE__)
+class AddEmployeeTimestamp < ActiveRecord::Migration[7.0]
-
+  def change
-class QboControllerTest < ActionController::TestCase
+    add_timestamps(:employees, null: true)
-  # Replace this with your real tests.
-  def test_truth
-    assert true
   end
 end

init.rb

@@ -11,32 +11,35 @@
 Redmine::Plugin.register :redmine_qbo do
   
   # About
-  name 'Redmine QBO DEVELOPMENT plugin'
+  name 'Redmine QBO plugin'
   author 'Rick Barrette'
-  description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
+  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.1.2'
+  version '2026.3.5'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
-  settings :default => {'empty' => true}, :partial => 'qbo/settings'
+  settings default: {empty: true}, partial: 'qbo/settings'
-  requires_redmine :version_or_higher => '6.1.0'
+  requires_redmine version_or_higher: '6.1.0'
   
   # Add safe attributes for core models
-  Issue.safe_attributes 'customer_id'
+  Issue.safe_attributes :customer_id
-  Issue.safe_attributes 'item_id'
+  Issue.safe_attributes :estimate_id
-  Issue.safe_attributes 'estimate_id'
+  Issue.safe_attributes :invoice_id
-  Issue.safe_attributes 'invoice_id'
+  User.safe_attributes :employee_id
-  User.safe_attributes 'employee_id'
+  TimeEntry.safe_attributes :billed
-  TimeEntry.safe_attributes 'billed'
   
   # set per_page globally
   WillPaginate.per_page = 20
 
   # Permissions for security
-  permission :view_customers, :customers => :index, :public => false
+  permission :view_customers, customers: :index, public: false
-  permission :add_customers, :customers => :new, :public => false
+  permission :add_customers, customers: :new, public: false
   
   # Register top menu items
-  menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
+  menu :top_menu, :customers, { controller: :customers, action: :index }, caption: :label_customers, if: Proc.new {User.current.logged?}
+    
+  Redmine::Search.map do |search|
+    search.register :customers
+  end
 
 end
 

lib/hooks/issues_form_hook_listener.rb

@@ -1,71 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-module Hooks
-
-  class IssuesFormHookListener < Redmine::Hook::ViewListener
-
-   include IssuesHelper
-
-    # Edit Issue Form
-    # Here we build the required form components before passing them to a partial view formatting. 
-    def view_issues_form_details_bottom(context={})
-      f = context[:form]
-      issue = context[:issue]
-
-      # Check to see if the issue already belongs to a customer
-      selected_customer = issue.customer ? issue.customer.id  : nil
-      selected_estimate = issue.estimate ? issue.estimate.id  : nil
-      
-      # Gernerate edit.js link
-      js_link = "updateIssueFrom('#{escape_javascript update_issue_form_path(issue.project, issue)}', this)"
-
-      # Load customer information
-      customer = Customer.find_by_id(selected_customer) if selected_customer
-
-      # Customer Name Text Box with database backed autocomplete
-      search_customer = f.autocomplete_field :customer,
-        autocomplete_customer_name_customers_path,
-        :selected => selected_customer,
-        :onchange => js_link,
-        :update_elements => { 
-          :id => '#issue_customer_id', 
-          :value => '#issue_customer' 
-        }
-
-      # Customer ID - Hidden Field
-      customer_id = f.hidden_field :customer_id,
-        :id => "issue_customer_id",
-        :onchange => js_link
-
-      # Load estimates
-      if issue.customer
-        estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
-      else
-        estimates = [nil].compact
-      end
-
-      # Generate the drop down list of quickbooks estimates
-      select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
-      
-      # Pass all prebuilt form components to our partial
-      context[:controller].send(:render_to_string, {
-        :partial => 'issues/form_hook',
-          locals: {
-            search_customer: search_customer, 
-            customer_id: customer_id, 
-            select_estimate: select_estimate
-          } 
-        }
-      )
-    end
-  end
-
-end

lib/hooks/issues_show_hook_listener.rb

@@ -1,54 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-module Hooks
-
-  class IssuesShowHookListener < Redmine::Hook::ViewListener
-
-    # View Issue
-    # Display the quickbooks contact in the issue
-    def view_issues_show_details_bottom(context={})
-      issue = context[:issue]
-      
-      # Check to see if there is a quickbooks user attached to the issue
-      if issue.customer
-        customer = link_to issue.customer.name, customer_path( issue.customer.id )
-      end
-      
-      # Estimate Number
-      if issue.estimate
-        estimate = issue.estimate.doc_number
-        estimate_link = link_to estimate, estimate_path( issue.estimate.id ), :target => "_blank"
-      end
-      
-      # Invoice Number
-      invoice_link = ""
-      if issue.invoice_ids
-        issue.invoice_ids.each do |i|
-          invoice = Invoice.find i
-          invoice_link = invoice_link + link_to( invoice.doc_number, invoice_path( i ), :target => "_blank").to_s + " "
-          invoice_link = invoice_link.html_safe
-        end
-      end
-      
-      context[:controller].send(:render_to_string, {
-        :partial => 'issues/show_details',
-          locals: {
-            customer: customer, 
-            estimate_link: estimate_link, 
-            invoice_link: invoice_link,
-            issue: issue
-          } 
-        })
-    end
-    
-  end
-
-end

lib/patches/issue_patch.rb

@@ -1,114 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require_dependency 'issue'
-
-module Patches
-
-
-  # Patches Redmine's Issues dynamically.
-  # Adds a relationships
-  module IssuePatch
-
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
-
-      base.send(:include, InstanceMethods)
-
-      # Same as typing in the class 
-      base.class_eval do
-        belongs_to :customer, primary_key: :id
-        belongs_to :customer_token, primary_key: :id
-        belongs_to :estimate, primary_key: :id
-        has_and_belongs_to_many :invoices
-      end
-      
-    end
-      
-    module ClassMethods
-      
-    end
-    
-    module InstanceMethods
-      
-      # Create billable time entries
-      def bill_time
-      
-        # Check to see if we have everything we need to bill the customer
-        return if assigned_to.nil?
-        return unless Qbo.first 
-        return unless customer 
-
-        # Get unbilled time entries
-        spent_time = time_entries.where(billed: [false, nil])
-        spent_hours ||= spent_time.sum(:hours) || 0
-        
-        if spent_hours > 0 then
-          
-          # Prepare to create a new Time Activity
-          qbo = Qbo.first
-          qbo.perform_authenticated_request do |access_token|
-            time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
-            item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
-            time_entry = Quickbooks::Model::TimeActivity.new
-    
-            # Lets total up each activity before billing.
-            # This will simpify the invoicing with a single billable time entry per time activity
-            h = Hash.new(0)
-            spent_time.each do |entry|
-              h[entry.activity.name] += entry.hours
-              # update time entries billed status
-              entry.billed = true
-              entry.save
-            end
-            
-            # Now letes upload our totals for each activity as their own billable time entry
-            h.each do |key, val|
-              
-              # Convert float spent time to hours and minutes
-              hours = val.to_i
-              minutesDecimal = (( val - hours) * 60)
-              minutes = minutesDecimal.to_i
-
-              # Lets match the activity to an qbo item
-              item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
-              next if item.nil?
-              
-              # Create the new billable time entry and upload it
-              time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
-              time_entry.employee_id = assigned_to.employee_id 
-              time_entry.customer_id = customer_id
-              time_entry.billable_status = "Billable"
-              time_entry.hours = hours
-              time_entry.minutes = minutes
-              time_entry.name_of = "Employee"
-              time_entry.txn_date = Date.today
-              time_entry.hourly_rate = item.unit_price
-              time_entry.item_id = item.id 
-              time_entry.start_time = start_date
-              time_entry.end_time = Time.now
-              time_service.create(time_entry)
-            end
-          end
-        end
-      end
-    end
-    
-    # Create a shareable link for a customer
-    def share_token
-      CustomerToken.get_token self
-    end
-    
-  end  
-
-  # Add module to Issue
-  Issue.send(:include, IssuePatch)
-
-end

lib/patches/pdf_patch.rb

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

lib/patches/query_patch.rb

@@ -1,38 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require_dependency 'issue_query'
-
-module Patches
-
-  module QueryPatch
-    
-    # Add qbo options to the aviable columns
-    def available_columns
-      unless @available_columns
-        @available_columns = self.class.available_columns.dup
-        @available_columns << QueryColumn.new(:customer, :sortable => "#{Issue.table_name}.customer_id", :groupable => true, :caption => :field_customer)
-        @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.billed", :groupable => true, :caption => :field_billed)
-      end
-      super
-    end
-    
-    # Add customers to filters
-    def initialize_available_filters
-      #add_available_filter "customer", :type => :text
-      super
-    end
-
-  end
-
-  # Add module to Issue
-  IssueQuery.send(:prepend, QueryPatch)
-
-end

lib/redmine_qbo/hooks/issues_hook_listener.rb

@@ -0,0 +1,103 @@
+#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.
+
+module RedmineQbo
+  module Hooks
+    class IssuesHookListener < Redmine::Hook::ViewListener
+
+      include IssuesHelper
+
+      # Edit Issue Form
+      # Here we build the required form components before passing them to a partial view formatting. 
+      def view_issues_form_details_bottom(context={})
+        log "view_issues_form_details_bottom: Building form components for quickbooks customer, estimate, and invoice data"
+        f = context[:form]
+        issue = context[:issue]
+        project = context[:project]
+
+        # Customer Name Text Box with database backed autocomplete
+        # onchange event will update the hidden customer_id field
+        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:
+        # 1. New issue Withough project:  /issues/new.js
+        # 2. New issue With project:      /projects/rmt/issues/new.js
+        # 3. Existing issue:              /issues/<ID>/edit.js
+        # The built in helper update_issue_form_path requires a project object to determine the correct path for new vs existing issues, 
+        # but it doesn't work for issue.project when creating new issues not in a project i.e. http://redmine.domain.com/issues/new . 
+        # So we need to figure out how to get a the @project from the controller calling the hook.
+        #
+        # If this is not handled correctly, it leads to a 422 error when creating a new issue and selecting a customer.
+        js_path = "updateIssueFrom('#{escape_javascript update_issue_form_path(project, issue)}', this)"
+        log js_path
+
+        # This hidden field is used for the customer ID for the issue
+        # the onchange event will reload the issue form via ajax to update the available estimates
+        customer_id = f.hidden_field :customer_id,
+          id: "issue_customer_id",
+          onchange: js_path.html_safe
+
+        # Generate the drop down list of quickbooks estimates owned by the selected customer
+        select_estimate = f.select :estimate_id, 
+          issue.customer ? issue.customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x} : [], 
+          selected: issue.estimate ? issue.estimate.id : nil, 
+          include_blank: true
+        
+        # Pass all prebuilt form components to our partial
+        context[:controller].send(:render_to_string, {
+          partial: 'issues/form_hook',
+            locals: {
+              search_customer: search_customer, 
+              customer_id: customer_id, 
+              select_estimate: select_estimate
+            } 
+          }
+        )
+      end
+
+      # View Issue
+      # Displays the quickbooks customer, estimate, & invoices attached to the issue
+      def view_issues_show_details_bottom(context={})
+        issue = context[:issue]
+        
+        # Build a list of invoice links
+        invoice_link = ""
+        if issue.invoices
+          issue.invoices.each do |i|
+            invoice_link += "#{link_to i, i, target: :_blank}<br/>"
+          end
+        end
+        
+        context[:controller].send(:render_to_string, {
+          partial: 'issues/show_details',
+            locals: {
+              customer: issue.customer ? link_to(issue.customer) : nil, 
+              estimate_link: issue.estimate ? link_to(issue.estimate, issue.estimate, target: :_blank) : nil, 
+              invoice_link: invoice_link.html_safe,
+              issue: issue
+            } 
+          })
+      end
+
+      private
+
+      def log(msg)
+        Rails.logger.info "[IssuesHookListener] #{msg}"
+      end
+      
+    end
+  end 
+end

lib/redmine_qbo/hooks/users_show_hook_listener.rb

@@ -8,26 +8,24 @@
 #
 #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 Hooks
+module RedmineQbo
+  module Hooks
 
-  class IssuesSaveHookListener < Redmine::Hook::ViewListener
+    class UsersShowHookListener < Redmine::Hook::ViewListener
 
-    # Called Before Issue Saved
+      # View User
-    def controller_issues_edit_before_save(context={})
+      def view_users_form(context={})
-      issue = context[:issue]
-      issue.subject = issue.subject.titleize
-    end
         
-    # Called After Issue Saved
+        # Update the users
-    def controller_issues_edit_after_save(context={})
+        #Employee.update_all
-      issue = context[:issue]
+    
-      begin
+        # Check to see if there is a quickbooks user attached to the issue
-        issue.bill_time if issue.status.is_closed?
+        @selected = context[:user]&.employee&.id
-      rescue
+
-        # TODO flash[:error] = "Unable to bill, check QBO Auth"
+        # Generate the drop down list of quickbooks contacts
+        return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), selected: @selected, include_blank: true}</p>"
       end
     end
 
   end
-
 end

lib/redmine_qbo/hooks/view_hook_listener.rb

@@ -0,0 +1,30 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module RedmineQbo
+  module Hooks
+
+    class ViewHookListener < Redmine::Hook::ViewListener
+
+      # Load the javascript to support the autocomplete forms
+      def view_layouts_base_html_head(context = {})
+        safe_join([
+          javascript_include_tag( 'application.js', plugin: :redmine_qbo),
+          javascript_include_tag( 'autocomplete-rails.js', plugin: :redmine_qbo),
+          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo)
+        ])
+      end
+
+      render_on :view_layouts_base_sidebar, partial: "qbo/sidebar"
+      render_on :view_layouts_base_body_bottom, partial: "qbo/footer"
+    end
+
+  end
+end

lib/redmine_qbo/patches/attachments_controller_patch.rb

@@ -10,7 +10,8 @@
 
 require_dependency 'attachments_controller'
 
-module Patches
+module RedmineQbo
+  module Patches
 
     module AttachmentsControllerPatch
 
@@ -43,4 +44,5 @@ module Patches
     # Add module to AttachmentsController
     AttachmentsController.send(:include, AttachmentsControllerPatch)
 
+  end
 end

lib/redmine_qbo/patches/issue_patch.rb

@@ -0,0 +1,78 @@
+#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.
+
+require_dependency 'issue'
+
+module RedmineQbo
+  module Patches
+    module IssuePatch
+
+      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
+
+          before_save :titlize_subject
+          after_commit :enqueue_billing, on: :update
+        end
+        
+      end
+
+      module ClassMethods
+
+      end
+
+      module InstanceMethods
+
+        # Enqueue a background job to bill the time spent on this issue to the associated customer in Quickbooks, if the issue is closed and has a customer assigned.
+        def enqueue_billing
+          log "Checking if issue needs to be billed for issue ##{id}"
+          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
+
+      # 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
+
+      private
+
+      def log(msg)
+          Rails.logger.info "[IssuePatch] #{msg}"
+      end
+    end
+
+    Issue.send(:include, IssuePatch)
+  end
+end

lib/redmine_qbo/patches/issues_controller_patch.rb

@@ -9,30 +9,28 @@
 #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 Patches
+module RedmineQbo
-
+  module Patches
     module IssuesControllerPatch
 
       module Helper
         def watcher_link(issue, user)
-        link = +''
+          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_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.included(base)
-
         base.class_eval do
           helper Helper
         end
-
       end 
-
     end
 
     # Add module to IssuessController
     IssuesController.send(:include, IssuesControllerPatch)
 
+  end
 end

lib/redmine_qbo/patches/pdf_patch.rb

@@ -0,0 +1,285 @@
+#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.
+
+require_dependency 'redmine/export/pdf'
+require_dependency 'redmine/export/pdf/issues_pdf_helper'
+
+module RedmineQbo
+  module Patches
+    module PdfPatch
+
+      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
+
+      module InstanceMethods
+
+        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
+
+          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
+
+      end
+
+      private
+
+      def log(msg)
+          Rails.logger.info "[PdfPatch] #{msg}"
+      end
+
+    end
+
+    Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)
+
+  end
+end

lib/redmine_qbo/patches/query_patch.rb

@@ -0,0 +1,70 @@
+#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.
+
+require_dependency 'issue_query'
+
+module RedmineQbo
+  module Patches
+    module QueryPatch
+
+      def base_scope
+        scope = super
+
+        if filters['customer_name'].present?
+          scope = scope.left_outer_joins(:customer)
+        end
+
+        if has_column?(:customer) || filters['customer_name'].present?
+          scope = scope.includes(:customer)
+        end
+
+        scope
+      end
+      
+      # Add qbo options to the aviable columns
+      def available_columns
+        unless @available_columns
+          @available_columns = self.class.available_columns.dup
+          @available_columns << QueryColumn.new(:customer, sortable: "#{Issue.table_name}.customer_id", groupable: true, caption: :field_customer)
+          @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.billed", groupable: true, caption: :field_billed)
+        end
+        super
+      end
+      
+      # Add customers to filters
+      def initialize_available_filters
+        #add_available_filter "customer_id", type: :list, name: l(:field_customer), :values => lambda {Customer.pluck(:name, :id).map {|name, id| [name, id.to_s]}}
+        add_available_filter( 'customer_name', type: :text, name: l(:field_customer))
+        super
+      end
+
+      def sql_for_customer_name_field(field, operator, value)
+        pattern = "%#{value.first}%"
+
+        sql = case operator
+              when '~'
+                "#{Customer.table_name}.name LIKE ?"
+              when '!~'
+                "#{Customer.table_name}.name NOT LIKE ?"
+              else
+                return nil
+              end
+
+        Issue.joins(:customer).sanitize_sql_for_conditions([sql, pattern])
+      end
+
+
+    end
+
+    # Add module to Issue
+    IssueQuery.send(:prepend, QueryPatch)
+
+  end
+end

lib/redmine_qbo/patches/time_entry_query_patch.rb

@@ -10,22 +10,22 @@
 
 require_dependency 'time_entry_query'
 
-module Patches
+module RedmineQbo
-
+  module Patches
     module TimeEntryQueryPatch
 
       # Add QBO options to columns
       def available_columns
         unless @available_columns
           @available_columns = self.class.available_columns.dup
-        @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_billed)
+          @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.name", groupable: true, caption: :field_billed)
         end
         super
       end
       
       # Add QBO options to the filter
       def initialize_available_filters
-      add_available_filter "billed", :type => :boolean
+        add_available_filter "billed", type: :boolean
         super
       end
 
@@ -34,4 +34,5 @@ module Patches
     # Add module to TimeEntryQuery
     TimeEntryQuery.send(:prepend, QueryPatch)
 
+  end
 end

lib/redmine_qbo/patches/user_patch.rb

@@ -10,7 +10,8 @@
 
 require_dependency 'user'
 
-module Patches
+module RedmineQbo
+  module Patches
 
     # Patches Redmine's User dynamically.
     # Adds a relationships
@@ -39,4 +40,5 @@ module Patches
     # Add module to Issue
     User.send(:include, UserPatch)
 
+  end
 end