Got the UI working

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/models/customer.rb

@@ -11,15 +11,13 @@
 class Customer < ActiveRecord::Base
 
   include Redmine::Acts::Searchable
-  include Redmine::Acts::Event  
+  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
 
@@ -32,116 +30,128 @@ class Customer < ActiveRecord::Base
                 :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.
+  # 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.
-  def details_cache_key
-    "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
+  # Convenience Method
+  # Sets the email
   def email=(s)
-    details
+    pull unless @details
     @details.email_address = s
   end
-  
 
-  # Returns the last sync time formatted for display. If no sync has occurred, returns a default message.
+  # Convenience Method
-  def self.last_sync
+  # returns the customer's primary phone
-    return I18n.t(:label_qbo_never_synced) unless maximum(:updated_at)
+  def primary_phone
-    format_time(maximum(:updated_at))
+    pull unless @details
+    begin
+      return @details.primary_phone.free_form_number
+    rescue
+      return nil
+    end
   end
   
+  # Convenience Method
+  # Updates the customer's primary phone number
+  def primary_phone=(n)
+    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
   # but we need to implement this method for the Redmine::Acts::Searchable interface
   def project
     nil
   end
 
-  # Magic Method
+  # Convenience Method
-  # Maps Get/Set methods to QBO customer object
-  def method_missing(method_name, *args, &block)
-    if Quickbooks::Model::Customer.method_defined?(method_name)
-      details
-      @details.public_send(method_name, *args, &block)
-    else
-      super
-    end
-  end
-
   # returns the customer's mobile phone
   def mobile_phone
-    details
+    pull unless @details
-    return @details&.mobile_phone&.free_form_number
+    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)
-    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.
-  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
+  # Magic Method
-  def primary_phone=(n)
+  # Maps Get/Set methods to QBO customer object
-    details
+  def method_missing(sym, *arguments)
-    pn = Quickbooks::Model::TelephoneNumber.new
+    # Check to see if the method exists
-    pn.free_form_number = n
+    if Quickbooks::Model::Customer.method_defined?(sym)
-    @details.primary_phone = pn
+      # download details if required
-  end
+      pull unless @details
-
+      method_name = sym.to_s
-  # 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.
+      # Setter
-  def respond_to_missing?(method_name, include_private = false)
+      if method_name[-1, 1] == "="
-    Quickbooks::Model::Customer.method_defined?(method_name) || super
+        @details.method(method_name).call(arguments[0])
+      # Getter
+      else
+        return @details.method(method_name).call 
+      end
+    end
   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
 
@@ -189,18 +210,19 @@ class Customer < ActiveRecord::Base
   alias_method :save, :save_with_push
   
   private
-
+  
-  # Fetches the customer's details from QuickBooks Online. If the customer has an ID, it makes an authenticated request to QBO to retrieve the customer's information. If the customer does not have an ID or if there is an error during the fetch, it returns a new instance of Quickbooks::Model::Customer with default values. This method is used to ensure that the customer object has the most up-to-date information from QBO when needed.
+  # 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,7 +35,40 @@ 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}"

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,7 +13,6 @@ 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
   end
@@ -110,11 +109,11 @@ class SyncServiceBase
     if local.changed?
       local.save!
       log "Updated #{@entity.name} #{remote.id}"
-
-      # Handle attaching documents if applicable to invoices
-      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}"
   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
+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.2'
+  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