Got the UI working

README.md

@@ -1,21 +1,14 @@
-# Redmine QuickBooks Online Plugin
+# Redmine QuickBooks Online
 
-A plugin for **Redmine** that integrates with **QuickBooks Online (QBO)** to automatically create **Time Activity entries** from billable hours logged on Issues.
+A plugin for Redmine to connect to QuickBooks Online.
 
-When an Issue associated with a Customer is closed, the plugin generates corresponding Time Activities in QuickBooks based on the Redmine Time Entries recorded for that Issue.
+The goal of this project is to allow Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed.
 
----
+## Disclaimer
 
-# Disclaimer
+**Note:** Although the core functionality is complete, this project is still under development and the master branch may be unstable. Tags should be stable and are recommended.
 
-The core functionality is implemented, but the project is **under active development**.
+## Compatibility
-
-The `master` branch may contain unstable changes.  
-For production deployments, **use a tagged release**.
-
----
-
-# Compatibility
 
 | Plugin Version | Redmine Version |
 | :--- | :--- |
@@ -24,244 +17,85 @@ For production deployments, **use a tagged release**.
 | Version 1.0.0+ | Redmine 4 |
 | Version 0.8.1 | Redmine 3 |
 
----
+## Features
 
-# Features
+* **Customer Assignment:** Issues can be assigned to a Customer via a dropdown in the edit Issue form.
+    * Once a customer is attached to an Issue, you can attach an Estimate to the issue via a dropdown menu.
+* **Employee Mapping:** An Employee is assigned to a Redmine User via a dropdown in the User Administration page.
+* **Automatic Billing:** If an Issue has been assigned a Customer, the following happens when the Issue is closed:
+    * A new Time Activity will be billed against the Customer assigned to the issue for each Redmine Time Entry.
+    * Time Entries will be totalled up by Activity name. This allows billing for different activities without having to create separate Issues.
+    * The Time Activity names are used to dynamically lookup Items in QuickBooks.
+    * If there are no Items that match the Activity name, it will be skipped and will not be billed to the Customer.
+    * Labor Rates are set by the corresponding Item in QuickBooks.
+* **Customer Management:** Customers can be created via the New Customer Page.
+    * Customers can be searched by name or phone number.
+    * Basic information for the Customer can be viewed/edited via the Customer page.
+* **Webhook Support:**
+    * **Invoices:** Automatically attached to an Issue if a line item contains a hashtag number (e.g., `#123`).
+    * **Custom Fields:** Invoice Custom Fields are matched to Issue Custom Fields and are automatically updated in QuickBooks. (Useful for extracting Mileage In/Out from the Issue to update the Invoice).
+    * **Sync:** Customers are automatically updated in the local database.
+* **Plugin View Hooks** Allows intergration of other features supported by companion plugins, for example [redmine_qbo_vehicles](https://github.com/rickbarrette/redmine_qbo_vehicles) adds customer vehicle interation
 
-## Issue Billing Integration
+## Prerequisites
 
-*   Assign a **QuickBooks Customer** to a Redmine Issue.
+* Sign up to become a developer for Intuit: https://developer.intuit.com/
+* Create your own application to obtain your API keys.
+* Set up the webhook service to `https://redmine.yourdomain.com/qbo/webhook`
 
-*   Optionally associate a **QuickBooks Estimate** with the Issue.
+## Installation
 
-*   Automatically associates a **QuickBooks Invoice** with the Issue.
+1. **Clone the plugin:**
+   Clone this repo into your plugin folder and checkout a tagged version.
+   ```bash
+   cd path/to/redmine/plugins
+   git clone git@github.com:rickbarrette/redmine_qbo.git
+   cd redmine_qbo
+   git checkout <tag>
+   ```
 
+2.  **Install dependencies:** *Crucial for Redmine 6 / Rails 7 compatibility.*
     
----
+    Bash
     
-## Automatic Time Activity Creation
+    ```
+    bundle install
+    ```
     
-When an Issue with an assigned Customer is closed:
+3.  **Migrate your database:**
     
-*   A **Time Activity** is created in QuickBooks for each relevant Redmine Time Entry.
+    Bash
     
-*   Time Entries are **grouped by Activity name**.
+    ```
+    bundle exec rake redmine:plugins:migrate RAILS_ENV=production
+    ```
     
-*   Activity names are used to **dynamically match Items in QuickBooks**.
+4.  **Restart Redmine:** You must restart your Redmine server instance for the plugin and hooks to load.
     
-*   If no matching Item exists, the activity is **skipped**.
+5.  **Configuration:**
     
-*   **Labor rates** are determined by the associated QuickBooks Item.
+    *   Navigate to the plugin configuration page (`Administration > Plugins > Configure`).
         
+    *   Supply your own OAuth Key & Secret.
         
----
+    *   After saving the Key & Secret, click the **Authenticate** link on the configuration page to connect to QBO.
         
-## Employee Mapping
+6.  **User Mapping:**
     
-Redmine Users can be mapped to **QuickBooks Employees** through the **User Administration** page.
+    *   Assign an Employee to each of your users via the **User Administration Page**.
         
-This ensures Time Activities are recorded under the correct employee in QuickBooks.
 
----
+## Usage
 
-## Customer Management
+To enable automatic Time Activity entries for an Issue, you simply need to assign a Customer to an Issue via the dropdowns in the issue creation/update form.
 
-The plugin provides basic Customer management:
+**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.   
 
-*   Create Customers directly from Redmine
+## Companion Plugin Hooks
-    
+* :pdf_left, { issue: issue }
-*   Search Customers by **name or phone number**
+* :pdf_right, { issue: issue }
-    
+* :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
-*   View and edit Customer information
+* :show_customer_view_right, {customer: @customer}
-    
-
-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

@@ -66,76 +66,67 @@ class CustomersController < ApplicationController
   # create a new customer
   def create
     @customer = Customer.new(allowed_params)
-    @customer.save
+    if @customer.save
-    log "Customer ##{@customer.id} created successfully."
+      flash[:notice] = t :notice_customer_created
-    flash[:notice] = t :notice_customer_created
+      redirect_to @customer
-    redirect_to @customer
+    else
-  rescue => e
+      flash[:error] = @customer.errors.full_messages.to_sentence
-    log "Failed to create customer: #{e.message}"
+      redirect_to new_customer_path
-    flash[:error] = e.message
+    end
-    redirect_to new_customer_path
   end
 
   # display a specific customer
   def show
-    @customer = Customer.find_by_id(params[:id])
+    begin
-    return render_404 unless @customer
+      @customer = Customer.find_by_id(params[:id])
-
+      @issues = @customer.issues.order(id: :desc)
-    @open_issues = @customer.issues
+      @billing_address = address_to_s(@customer.billing_address)
-      .joins(:status)
+      @shipping_address = address_to_s(@customer.shipping_address)
-      .includes(:status, :project, :tracker, :priority)
+      @closed_issues = (@issues - @issues.open)
-      .where(issue_statuses: { is_closed: false })
+      @hours = 0
-      .order(id: :desc)
+      @closed_hours = 0
-
+      @issues.open.each { |i| @hours+= i.total_spent_hours }
-    @closed_issues = @customer.issues
+      @closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
-      .joins(:status)
+    rescue 
-      .includes(:status, :project, :tracker, :priority)
+      flash[:error] = t :notice_customer_not_found
-      .where(issue_statuses: { is_closed: true })
+      render_404
-      .order(id: :desc)
+    end
-
-    @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
 
   # return an HTML form for editing a customer
   def edit
-    @customer = Customer.find_by_id(params[:id])
+    begin
-    return render_404 unless @customer
+      @customer = Customer.find_by_id(params[:id])
-  rescue => e
+    rescue 
-    log "Failed to edit customer"
+      flash[:error] = t :notice_customer_not_found
-    flash[:error] = e.message
+      render_404
-    render_404
+    end
   end
 
   # update a specific customer
   def update
-    @customer = Customer.find_by_id(params[:id])
+    begin
-    @customer.update(allowed_params)
+      @customer = Customer.find_by_id(params[:id])
-    flash[:notice] = t :notice_customer_updated
+      if @customer.update(allowed_params)
-    redirect_to @customer
+        flash[:notice] = t :notice_customer_updated
-  rescue => e
+        redirect_to @customer
-    log "Failed to update customer: #{e.message}"
+      else
-    flash[:error] = e.message
+        redirect_to edit_customer_path
-    redirect_to edit_customer_path
+        flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
+      end
+    rescue 
+      flash[:error] = t :notice_customer_not_found
+      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])
+
     token = issue.share_token
     redirect_to view_path(token.token)
+
   rescue ActiveRecord::RecordNotFound
     flash[:error] = t(:notice_issue_not_found)
     render_404

app/jobs/bill_issue_time_job.rb

@@ -17,8 +17,10 @@ class BillIssueTimeJob < ActiveJob::Base
     issue = Issue.find(issue_id)
 
     log "Starting billing for issue ##{issue.id}"
+
     issue.with_lock do
       unbilled_entries = issue.time_entries.where(billed: [false, nil]).lock
+
       return if unbilled_entries.blank?
 
       totals = aggregate_hours(unbilled_entries)
@@ -26,6 +28,8 @@ class BillIssueTimeJob < ActiveJob::Base
       log "Aggregated hours for billing: #{totals.inspect}"
 
       qbo = QboConnectionService.current!
+      raise "No QBO configuration found" unless qbo
+
       qbo.perform_authenticated_request do |access_token|
         create_time_activities(issue, totals, access_token, qbo)
       end

app/jobs/qbo_sync_dispatcher.rb

@@ -19,23 +19,6 @@ class QboSyncDispatcher
 
   # Dispatches all synchronization jobs to perform a full sync of QuickBooks entities with the local database. Each job is enqueued with the `full_sync` flag set to true.
   def self.full_sync!
-
+    SYNC_JOBS.each { |job| job.perform_later(full_sync: true) }
-    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/webhook_process_job.rb

@@ -43,14 +43,7 @@ class WebhookProcessJob < ActiveJob::Base
     name = entity['name']
     id   = entity['id']&.to_i
 
-    entitys = ALLOWED_ENTITIES.dup
+    return unless ALLOWED_ENTITIES.include?(name)
-    # 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

app/models/customer.rb

@@ -12,14 +12,12 @@ 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
 
@@ -33,41 +31,44 @@ class Customer < ActiveRecord::Base
                 :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.
+  # Convenience Method
-  def details
+  # returns the customer's email
-    return (@details ||= Quickbooks::Model::Customer.new) if new_record?
+  def email
-
+    pull unless @details
-    @details ||= begin
+    begin
-      xml = Rails.cache.fetch(details_cache_key, expires_in: 10.minutes) do
+      return @details.email_address.address
-        fetch_details.to_xml_ns
+    rescue
-      end
+      return nil
-
-      Quickbooks::Model::Customer.from_xml(xml)
     end
   end
   
-  # Generates a unique cache key for storing this customer's QBO details.
+  # Convenience Method
-  def details_cache_key
+  # Sets the email
-    "customer:#{id}:qbo_details:#{updated_at.to_i}"
-  end
-
-  # Returns the customer's email address
-  def email
-    details
-    return @details&.email_address&.address
-  end
-  
-  # Updates the customer's email address
   def email=(s)
-    details
+    pull unless @details
     @details.email_address = s
   end
 
+  # Convenience Method
+  # returns the customer's primary phone
+  def primary_phone
+    pull unless @details
+    begin
+      return @details.primary_phone.free_form_number
+    rescue
+      return nil
+    end
+  end
   
-  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  # Convenience Method
-  def self.last_sync
+  # Updates the customer's primary phone number
-    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+  def primary_phone=(n)
-    format_time(maximum(:updated_at))
+    pull unless @details
+    pn = Quickbooks::Model::TelephoneNumber.new
+    pn.free_form_number = n
+    @details.primary_phone = pn
+    #update our locally stored number too
+    update_phone_number
   end
 
   # Customers are not bound by a project
@@ -76,72 +77,81 @@ class Customer < ActiveRecord::Base
     nil
   end
 
-  # Magic Method
+  # Convenience Method
-  # Maps Get/Set methods to QBO customer object
+  # returns the customer's mobile phone
-  def method_missing(method_name, *args, &block)
+  def mobile_phone
-    if Quickbooks::Model::Customer.method_defined?(method_name)
+    pull unless @details
-      details
+    begin
-      @details.public_send(method_name, *args, &block)
+      return @details.mobile_phone.free_form_number
-    else
+    rescue
-      super
+      return nil
     end
   end
   
-  # returns the customer's mobile phone
+  # Convenience Method
-  def mobile_phone
-    details
-    return @details&.mobile_phone&.free_form_number
-  end
-  
   # Updates the custome's mobile phone number
   def mobile_phone=(n)
-    details
+    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)
-    details
+    pull unless @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.
+  # Magic Method
-  def normalize_phone_numbers
+  # Maps Get/Set methods to QBO customer object
-    self.phone_number = phone_number.to_s.gsub(/\D/, '') if phone_number.present?
+  def method_missing(sym, *arguments)
-    self.mobile_phone_number = mobile_phone_number.to_s.gsub(/\D/, '') if mobile_phone_number.present?
+    # Check to see if the method exists
-  end
+    if Quickbooks::Model::Customer.method_defined?(sym)
-
+      # download details if required
-  # Sets the notes for the customer
+      pull unless @details
-  def notes=(s)
+      method_name = sym.to_s
-    details
+      # Setter
-    @details.notes = s
+      if method_name[-1, 1] == "="
-  end
+        @details.method(method_name).call(arguments[0])
-
+      # Getter
-  # returns the customer's primary phone
+      else
-  def primary_phone
+        return @details.method(method_name).call 
-    details
+      end
-    return @details&.primary_phone&.free_form_number
+    end
-  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)
-    #return none if search.blank?
     search = sanitize_sql_like(search)
     where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
   end
@@ -160,28 +170,39 @@ class Customer < ActiveRecord::Base
     ids.index_with { |id| id }
   end
   
-  # performs a sync operation for all customers
+  # proforms a bruteforce sync operation
   def self.sync 
     CustomerSyncJob.perform_later(full_sync: false)
   end
 
-  # performs a sync operation for a specific customer
+  # proforms a bruteforce sync operation
   def self.sync_by_id(id) 
     CustomerSyncJob.perform_later(id: id)
   end
   
   # returns a human readable string
   def to_s
-    last4 = phone_number&.last(4)
+    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
-    last4.present? ? "#{name} - #{last4}" : name.to_s
   end
 
   # Push the updates
   def save_with_push
-    log "Starting push for customer ##{self.id}..."
+    begin
-    qbo = QboConnectionService.current!
+      qbo = Qbo.first
-    CustomerService.new(qbo: qbo, customer: self).push()
+      @details = qbo.perform_authenticated_request do |access_token|
-    Rails.cache.delete(details_cache_key)
+        service = Quickbooks::Service::Customer.new(
+          company_id: qbo.realm_id,
+          access_token: access_token
+        )
+        service.update(@details)
+      end
+
+      self.id = @details.id
+    rescue => e
+      errors.add(:base, e.message)
+      return false
+    end
+
     save_without_push
   end
 
@@ -190,17 +211,18 @@ class Customer < ActiveRecord::Base
   
   private
   
-  # Fetches the customer's details from QuickBooks Online. If the customer has an ID, it makes an authenticated request to QBO to retrieve the customer's information. If the customer does not have an ID or if there is an error during the fetch, it returns a new instance of Quickbooks::Model::Customer with default values. This method is used to ensure that the customer object has the most up-to-date information from QBO when needed.
+  # pull the details
-  def fetch_details
+  def pull
-    return Quickbooks::Model::Customer.new unless id.present?
+    begin
-    log "Fetching details for customer ##{id} from QBO..."
+      raise Exception unless self.id
-    qbo = QboConnectionService.current!
+      qbo = QboConnectionService.current!
-    CustomerService.new(qbo: qbo, customer: self).pull()
+      @details = qbo.perform_authenticated_request do |access_token|
-  end
+        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
-
+        service.fetch_by_id(self.id)
-  # Log messages with the entity type for better traceability
+      end
-  def log(msg)
+    rescue Exception => e
-    Rails.logger.info "[Customer] #{msg}"
+      @details = Quickbooks::Model::Customer.new
+    end
   end
   
 end

app/models/employee.rb

@@ -10,19 +10,11 @@
 
 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
     EmployeeSyncJob.perform_later(full_sync: true)

app/models/estimate.rb

@@ -10,19 +10,11 @@
 
 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
 
-  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
-  def self.last_sync
-    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
-    format_time(maximum(:updated_at))
-  end
-
   # returns a human readable string
   def to_s
     return self[:doc_number]
@@ -43,8 +35,41 @@ class Estimate < ActiveRecord::Base
     EstimateSyncJob.perform_later(doc_number: number)
   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 pull
+    log "Pulling details for estimate ##{self.id}..."
+    begin
+      raise Exception unless self.id
+      qbo = QboConnectionService.current!
+      @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
+
   def log(msg)
     Rails.logger.info "[Estimate] #{msg}"
   end

app/models/invoice.rb

@@ -9,9 +9,6 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Invoice < ActiveRecord::Base
-
-  include Redmine::I18n
-
   has_and_belongs_to_many :issues
   belongs_to :customer
 
@@ -20,12 +17,6 @@ class Invoice < ActiveRecord::Base
 
   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
-
   # Return the invoice's document number as its string representation
   def to_s
     doc_number

app/models/line_item.rb

@@ -0,0 +1,7 @@
+class LineItem < ApplicationRecord
+  belongs_to :issue
+
+  validates :description, presence: true
+  validates :quantity, numericality: { greater_than: 0 }
+  validates :unit_price, numericality: { greater_than_or_equal_to: 0 }
+end

app/services/customer_service.rb

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

@@ -13,15 +13,8 @@ class SyncServiceBase
 
   # 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)
@@ -31,35 +24,34 @@ class SyncServiceBase
 
   # Sync all entities, or only those updated since the last sync
   def sync(full_sync: false)
-    log "Starting #{full_sync ? 'full' : 'incremental'} #{@entity.name} sync with page size of: #{@page_size}"
+    log "Starting #{full_sync ? 'full' : 'incremental'} #{@entity.name} sync"
 
     @qbo.perform_authenticated_request do |access_token|
       service_class = "Quickbooks::Service::#{@entity.name}".constantize
       service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
       
-      query = build_query(full_sync)
+      page = 1
+      loop do
+        collection = fetch_page(service, page, full_sync)
+        entries = Array(collection&.entries)
+        break if entries.empty?
 
-      service.query_in_batches(query, per_page: @page_size) do |batch|
+        entries.each { |remote| persist(remote) }
-        entries = Array(batch)
-        log "Processing batch of #{entries.size} #{@entity.name}"
 
-        entries.each do |remote|
+        break if entries.size < PAGE_SIZE
-          persist(remote)
+        page += 1
-        end
       end
     end
 
     log "#{@entity.name} sync complete"
   end
 
-  # Sync a single entity by its QBO ID (webhook usage)
+  # Sync a single entity by its QBO ID, used for webhook updates
   def sync_by_id(id)
     log "Syncing #{@entity.name} with ID #{id}"
-
     @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
@@ -67,21 +59,6 @@ class SyncServiceBase
 
   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
@@ -96,6 +73,24 @@ class SyncServiceBase
     Rails.logger.info "[#{@entity.name}SyncService] #{msg}"
   end
 
+  # Fetch a page of entities, either all or only those updated since the last sync
+  def fetch_page(service, page, full_sync)
+    log "Fetching page #{page} of #{@entity.name} from QBO (#{full_sync ? 'full' : 'incremental'} sync)"
+    start_position = (page - 1) * PAGE_SIZE + 1
+
+    if full_sync
+      service.query("SELECT * FROM #{@entity.name} STARTPOSITION #{start_position} MAXRESULTS #{PAGE_SIZE}")
+    else
+      last_update = @entity.maximum(:updated_at) || 1.year.ago
+      service.query(<<~SQL.squish)
+        SELECT * FROM #{@entity.name}
+        WHERE MetaData.LastUpdatedTime > '#{last_update.utc.iso8601}'
+        STARTPOSITION #{start_position}
+        MAXRESULTS #{PAGE_SIZE}
+      SQL
+    end
+  end
+
   # Create or update a local entity record based on the QBO remote data
   def persist(remote)
     local = @entity.find_or_initialize_by(id: remote.id)
@@ -108,20 +103,24 @@ class SyncServiceBase
       return
     end
 
+    # Map remote attributes to local model fields, this should be implemented in subclasses
     process_attributes(local, remote)
 
     if local.changed?
       local.save!
       log "Updated #{@entity.name} #{remote.id}"
-      attach_documents(local, remote)
     end
 
+    # Handle attaching documents if applicable to invoices
+    attach_documents(local, remote)
+
   rescue => e
-    log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
+      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/_details.html.erb

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

app/views/customers/show.html.erb

@@ -46,8 +46,8 @@
   </div>
 
 <br/>
-<h3><%=@open_issues.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
-<%= render partial: 'issues/list_simple', locals: {issues: @open_issues.open} %>
+<%= render partial: 'issues/list_simple', locals: {issues: @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} %>

app/views/issues/_form_hook.html.erb

@@ -7,3 +7,6 @@
 <p>
     <%= select_estimate %>
 </p> 
+
+
+<%= render "line_items/issue_form", f: f %>

app/views/line_items/_issue_form.html.erb

@@ -0,0 +1,17 @@
+<% @issue.line_items.build if @issue.line_items.empty? %>
+
+<div data-nested-form data-wrapper-selector=".line-item">
+  <div data-nested-form-container>
+    <%= f.fields_for :line_items do |item_form| %>
+      <%= render "line_items/line_item_fields", f: item_form %>
+    <% end %>
+  </div>
+
+  <template data-nested-form-template>
+    <%= f.fields_for :line_items, LineItem.new, child_index: "NEW_RECORD" do |item_form| %>
+      <%= render "line_items/line_item_fields", f: item_form %>
+    <% end %>
+  </template>
+
+  <button type="button" data-nested-form-add>Add Line Item</button>
+</div>

app/views/line_items/_line_item_fields.html.erb

@@ -0,0 +1,13 @@
+<div class="line-item">
+  <%= f.hidden_field :id %>
+
+  <%= f.text_field :description, placeholder: "Description" %>
+  <%= f.number_field :quantity, step: 1, placeholder: "Quantity" %>
+  <%= f.number_field :unit_price, step: 0.01, placeholder: "Unit Price" %>
+
+  <%= f.hidden_field :_destroy %>
+
+  <button type="button" data-nested-form-remove>
+    Remove
+  </button>
+</div>

app/views/qbo/_last_sync.html.erb

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

app/views/qbo/_settings.html.erb

@@ -66,12 +66,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
      <tr>
         <th><%=t(:label_oauth_expires)%></th>
-        <td><%= QboConnectionService.current!&.oauth2_access_token_expires_at %>
+        <td><%= if Qbo.exists? then QboConnectionService.current!.oauth2_access_token_expires_at end %>
       </tr>
       
       <tr>
         <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
-        <td><%= QboConnectionService.current!&.oauth2_refresh_token_expires_at %>
+        <td><%= if Qbo.exists? then QboConnectionService.current!.oauth2_refresh_token_expires_at end %>
      </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%> @ <%= Customer.last_sync %>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%>
     </div>
       
     <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %> @ <%= Employee.last_sync %>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %>
     </div>
     
     <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %> @ <%= Invoice.last_sync%>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %>
     </div>
     
     <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %> @ <%= Estimate.last_sync %>
+        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %>
     </div>
       
     <br/>

assets/javascripts/nested_form_controller.js

@@ -0,0 +1,53 @@
+(function () {
+  function initNestedForms() {
+    document.querySelectorAll("[data-nested-form]").forEach(function (wrapper) {
+      if (wrapper.dataset.initialized === "true") return;
+      wrapper.dataset.initialized = "true";
+
+      const container = wrapper.querySelector("[data-nested-form-container]");
+      const template = wrapper.querySelector("[data-nested-form-template]");
+
+      if (!container || !template) return;
+
+      wrapper.addEventListener("click", function (event) {
+        const addButton = event.target.closest("[data-nested-form-add]");
+        const removeButton = event.target.closest("[data-nested-form-remove]");
+
+        // ADD
+        if (addButton) {
+          event.preventDefault();
+
+          const content = template.innerHTML.replace(
+            /NEW_RECORD/g,
+            Date.now().toString()
+          );
+
+          container.insertAdjacentHTML("beforeend", content);
+        }
+
+        // REMOVE
+        if (removeButton) {
+          event.preventDefault();
+
+          const lineItem = removeButton.closest(wrapper.dataset.wrapperSelector);
+          if (!lineItem) return;
+
+          const destroyField = lineItem.querySelector("input[name*='_destroy']");
+
+          if (destroyField) {
+            destroyField.value = "1";
+            lineItem.style.display = "none";
+          } else {
+            lineItem.remove();
+          }
+        }
+      });
+    });
+  }
+
+  // Works for full load
+  document.addEventListener("DOMContentLoaded", initNestedForms);
+
+  // Works for Turbo navigation
+  document.addEventListener("turbo:load", initNestedForms);
+})();

db/migrate/026_create_line_items.rb

@@ -1,26 +0,0 @@
-#The License
-#
-#Copyright (c) 2016 - 2026 Rick Barrette - All Rights Reserved
-# 
-#Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
-#
-#Proprietary and confidential
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class CreateLineItems < ActiveRecord::Migration[5.1]
-  def change  
-    create_table :line_items do |t| 
-      t.integer  :item_id
-      t.float    :amount
-      t.string   :description 
-      t.float    :unit_price 
-      t.float    :quantity
-      t.boolean  :billed
-    end
-    
-    add_reference :line_items, :issues, index: true
-  end
-end

db/migrate/032_add_txn_dates.rb

@@ -11,8 +11,9 @@
 class AddTxnDates < ActiveRecord::Migration[5.1]
 
   def change
-    add_column :qbo_invoices, :txn_date, :date
+    begin
-    add_column :qbo_estimates, :txn_date, :date
+      add_column :qbo_invoices, :txn_date, :date
+      add_column :qbo_estimates, :txn_date, :date
   end
 
 end

db/migrate/034_remove_qbo_items.rb

@@ -12,6 +12,5 @@ class RemoveQboItems < ActiveRecord::Migration[5.1]
   def change
     drop_table :qbo_items
     drop_table :qbo_purchases
-    drop_table :line_items
   end
 end

db/migrate/043_create_line_items.rb

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

init.rb

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

lib/redmine_qbo/hooks/issues_hook_listener.rb

@@ -21,6 +21,8 @@ module RedmineQbo
         f = context[:form]
         issue = context[:issue]
         project = context[:project]
+        log issue.inspect
+        log project.inspect
 
         # Customer Name Text Box with database backed autocomplete
         # onchange event will update the hidden customer_id field
@@ -62,7 +64,8 @@ module RedmineQbo
             locals: {
               search_customer: search_customer, 
               customer_id: customer_id, 
-              select_estimate: select_estimate
+              select_estimate: select_estimate,
+              f: context[:form]
             } 
           }
         )

lib/redmine_qbo/hooks/users_show_hook_listener.rb

@@ -20,7 +20,7 @@ module RedmineQbo
         #Employee.update_all
     
         # Check to see if there is a quickbooks user attached to the issue
-        @selected = context[:user]&.employee&.id
+        @selected = context[:user].employee.id if context[:user].employee
 
         # 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>"

lib/redmine_qbo/hooks/view_hook_listener.rb

@@ -18,7 +18,8 @@ module RedmineQbo
         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)
+          javascript_include_tag( 'checkbox_controller.js', plugin: :redmine_qbo),
+          javascript_include_tag( 'nested_form_controller.js', plugin: :redmine_qbo)
         ])
       end
 

lib/redmine_qbo/patches/issue_patch.rb

@@ -23,6 +23,8 @@ module RedmineQbo
           belongs_to :customer_token, primary_key: :id
           belongs_to :estimate, primary_key: :id
           has_and_belongs_to_many :invoices
+          has_many :line_items, dependent: :destroy
+          accepts_nested_attributes_for :line_items, allow_destroy: true
 
           before_save :titlize_subject
           after_commit :enqueue_billing, on: :update

lib/redmine_qbo/patches/pdf_patch.rb

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