2026.2.0

removed unused js
removed subject from logs
2026-02-13 17:13:59 -05:00 · 2026-02-06 19:37:32 -05:00 · 2026-02-06 19:28:42 -05:00 · 2026-02-06 18:58:16 -05:00 · 2026-02-06 18:55:49 -05:00 · 2026-02-06 18:52:11 -05:00
130 changed files with 1598 additions and 2012 deletions
--- a/5
+++ b/5
@@ -1,12 +1,13 @@
 source 'https://rubygems.org'

 gem 'quickbooks-ruby'
-gem 'oauth2', '1.4.7'
+gem 'oauth2'
 gem 'roxml'
-gem 'nhtsa_vin'
 gem 'will_paginate'
 gem 'rails-jquery-autocomplete'
 gem 'jquery-ui-rails'
+gem 'rexml'
+gem 'combine_pdf'

 group :assets do
  gem 'coffee-rails'
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2016 - 2022 Rick Barrette
+Copyright (c) 2016 - 2026 Rick Barrette

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,78 +1,110 @@
-# Redmine Quickbooks Online
+# Redmine QuickBooks Online

-A plugin for Redmine to connect to Quickbooks Online
+A plugin for Redmine to connect to QuickBooks Online.

-The goal of this project is to allow Redmine to connect with Quickbooks Online to create Time Activity Entries for billable hours loged when an Issue is closed.
+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 & the master branch may be unstable. Tags should be stable and are recommended
+**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.

-Use tags Version 1.0.0+ for Redmine 4+ and Version 0.8.1 for Redine 3
+## Compatibility

-#### Features
-* Issues can be assigned to a Customer via drop down in the edit Issue form
-  - Once a customer is attached to an Issue, you can attach an Estimate to the issue via a drop down menu
-* Employee is assigned to a user via a drop down in the user admistration page.
-* IF an Issue has been assined a Customer when an Issue is closed the following will happen:
-  - A new Time Activity will be billed agaist the Customer assinged to the issue for each Redmine Time Entery. 
-    + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
-    + The Time Activity names are used to dynamically lookup Items in Quickbooks.
-    + IF there isn't any Items that match the Activity name it will be skipped, and will not be billed to the Customer 
-  - Labor Rates are set by corresponding the Item in Quickbooks
-* 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/edit via the Customer page
-* Webhook Support
-  - Invoices are automaticly attached to an Issue if a line item has a hashtag number in a Line Item
-    + Invoice Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
-  - Customers are automaticly updated in local database
+| Plugin Version | Redmine Version |
+| :--- | :--- |
+| Version 2026.1.0+ | Redmine 6.1 |
+| Version 2.0.0+ | Redmine 5 |
+| 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.
+    * 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

 ## Prerequisites

-* Sign up to become a developer for Intuit https://developer.intuit.com/
-* Create your own aplication to obtain your API keys
-* Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
+* 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`

-## The Install
+## Installation

-1. To install, clone this repo into your plugin folder & checkout a tagged version
+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>
+   ```

-  `git clone git@github.com:rickbarrette/redmine_qbo.git` 
-  
-  then
-  
-  `git checkout <tag>`
-  
-2. Migrate your database
-
-  `rake redmine:plugins:migrate RAILS_ENV=production`
-  
-3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
-
-4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
-
-5. Assign an Employee to each of your users via the User Administration Page
+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 need only to assign a Customer to an Issue via drop downs in the issue creation/update form.
+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.

-Note: After the inital synchronization, this plugin will recieve push notifications via Intuit's webhook service.
+**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.   

-## TODO
-  * Add Setting for Sandbox Mode
-  * Seperate Vehicles into a seperate plugin (I use redmine for my automotive shop management 😉)
-  * MORE Stuff as I make it up...
+## Companion Plugin Hooks
+* :pdf_left, { issue: issue }
+* :pdf_right, { issue: issue }
+* :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
+* :show_customer_view_right, {customer: @customer}

 ## License

-The MIT License (MIT)
-
-Copyright (c) 2016 - 2022 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.
+> 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.
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,7 +10,6 @@

 # This controller class will handle map management
 class CustomersController < ApplicationController
-  unloadable

  include AuthHelper
  helper :issues
@@ -27,22 +26,16 @@ class CustomersController < ApplicationController
  include SortHelper
  helper :timelog

-  before_action :add_customer, :only => :new
-  before_action :view_customer, :except => [:new, :view]
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
+  before_action :add_customer, only: :new
+  before_action :view_customer, except: [:new, :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)
-  end
-
-  # getter method for a customer's vehicles
-  # used for customer autocomplete field / issue form
-  def filter_vehicles_by_customer
-    @filtered_vehicles = Vehicle.all.where(customer_id: params[:selected_customer])
+    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
  end

  # getter method for a customer's invoices
@@ -60,7 +53,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]).paginate(page: params[:page])
      if only_one_non_zero?(@customers)
        redirect_to @customers.first
      end
@@ -76,7 +69,7 @@ class CustomersController < ApplicationController
  def create
    @customer = Customer.new(allowed_params)
    if @customer.save
-      flash[:notice] = "New Customer Created"
+      flash[:notice] = t :notice_customer_created
      redirect_to @customer
    else
      flash[:error] = @customer.errors.full_messages.to_sentence
@@ -88,12 +81,16 @@ class CustomersController < ApplicationController
  def show
    begin
      @customer = Customer.find_by_id(params[:id])
-      @vehicles = @customer.vehicles.paginate(:page => params[:page])
      @issues = @customer.issues.order(id: :desc)
      @billing_address = address_to_s(@customer.billing_address)
      @shipping_address = address_to_s(@customer.shipping_address)
      @closed_issues = (@issues - @issues.open)
+      @hours = 0
+      @closed_hours = 0
+      @issues.open.each { |i| @hours+= i.total_spent_hours }
+      @closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
    rescue 
+      flash[:error] = t :notice_customer_not_found
      render_404
    end
  end
@@ -103,6 +100,7 @@ class CustomersController < ApplicationController
    begin
      @customer = Customer.find_by_id(params[:id])
    rescue 
+      flash[:error] = t :notice_customer_not_found
      render_404
    end
  end
@@ -111,14 +109,15 @@ class CustomersController < ApplicationController
  def update
    begin
      @customer = Customer.find_by_id(params[:id])
-      if @customer.update_attributes(allowed_params)
-        flash[:notice] = "Customer updated"
+      if @customer.update(allowed_params)
+        flash[:notice] = t :notice_customer_updated
        redirect_to @customer
      else
        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
@@ -127,9 +126,10 @@ class CustomersController < ApplicationController
  def destroy
    begin
      Customer.find_by_id(params[:id]).destroy
-      flash[:notice] = "Customer deleted successfully"
+      flash[:notice] = t :notice_customer_deleted
      redirect_to action: :index
    rescue 
+      flash[:error] = t :notice_customer_not_deleted
      render_404
    end
  end
@@ -138,7 +138,7 @@ class CustomersController < ApplicationController
  def share

    Thread.new do
-      logger.debug "Removing expired customer tokens"
+      logger.info "Removing expired customer tokens"
      CustomerToken.remove_expired_tokens
      ActiveRecord::Base.connection.close
    end
@@ -147,6 +147,7 @@ class CustomersController < ApplicationController
      issue = Issue.find_by_id(params[:id])
      redirect_to view_path issue.share_token.token
    rescue
+      flash[:error] = t :notice_issue_not_found
      render_404
    end
  end
@@ -165,7 +166,7 @@ class CustomersController < ApplicationController
      @issue = Issue.find @token.issue_id
      @journals = @issue.journals.
        preload(:details).
-        preload(:user => :email_address).
+        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)
@@ -179,9 +180,10 @@ class CustomersController < ApplicationController
      @relations = @issue.relations.select {|r| r.other_issue(@issue) && 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
+      flash[:error] = t :notice_forbidden
      render_403
    end
  end
@@ -214,14 +216,14 @@ class CustomersController < ApplicationController
  # format a quickbooks address to a human readable string
  def address_to_s (address)
    return if address.nil?
-    string = address.line1
+    string = address.line1 if address.line1
    string << "\n" + address.line2 if address.line2
    string << "\n" + address.line3 if address.line3
    string << "\n" + address.line4 if address.line4
    string << "\n" + address.line5 if address.line5
-    string << " " + address.city
-    string << ", " + address.country_sub_division_code
-    string << " " + address.postal_code
+    string << " " + address.city if address.city
+    string << ", " + address.country_sub_division_code if address.country_sub_division_code
+    string << " " + address.postal_code if address.postal_code
    return string
  end

--- a/app/controllers/estimate_controller.rb
+++ b/app/controllers/estimate_controller.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,23 +8,37 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class EstimateController < ApplicationController
-  unloadable
  
  include AuthHelper
  
-  before_action :require_user
+  before_action :require_user, unless: proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
+
+  def get_estimate
+    # 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
-    e = Estimate.find_by_id(params[:id]) if params[:id]
-    e = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    estimate = get_estimate

    begin
-      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
    rescue
-      redirect_to :back, :flash => { :error => "Estimate not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
    end
  end

@@ -32,13 +46,12 @@ class EstimateController < ApplicationController
  # Downloads estimate by document number
  #
  def doc
-    e = Estimate.find_by_doc_number(params[:id]) if params[:id]
-    e = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    estimate = get_estimate
    
    begin
-      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
    rescue
-      redirect_to :back, :flash => { :error => "Estimate not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
    end
  end

--- a/app/controllers/invoice_controller.rb
+++ b/app/controllers/invoice_controller.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,24 +8,47 @@
 #
 #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
-  unloadable
  
  include AuthHelper
-  
-  before_action :require_user, :unless => proc {|c| session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+  require 'combine_pdf'
+
+  before_action :require_user, unless: proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
  
  #
  # Downloads and forwards the invoice pdf
  #
  def show
+    logger.info("Processing request for URL: #{request.original_url}") 
    begin
-      base = Invoice.get_base
-      invoice = base.fetch_by_id(params[:id])
-      @pdf = base.pdf(invoice)
-      send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/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)
+        
+        # If multiple id's then pull each pdf & combine them
+        if params[:invoice_ids]
+          logger.info("Grabbing pdfs for " + params[:invoice_ids].join(', '))
+          ref = ""
+          params[:invoice_ids].each do |i|
+            logger.info("processing " + i)
+            invoice = service.fetch_by_id(i)
+            ref += " #{invoice.doc_number}"
+            @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"
+      end
    rescue
-      redirect_to :back, :flash => { :error => "Invoice not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_invoice_not_found) }
    end
  end
 end
--- a/app/controllers/qbo_controller.rb
+++ b/app/controllers/qbo_controller.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,14 +9,13 @@
 #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
-  unloadable
  
  require 'openssl'
  
  include AuthHelper
  
-  before_action :require_user, :except => :webhook
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
+  before_action :require_user, except: :webhook
+  skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:webhook]

  def allowed_params
    params.permit(:code, :state, :realmId, :id)
@@ -26,9 +25,10 @@ class QboController < ApplicationController
  # Called when the user requests that Redmine to connect to QBO
  #
  def authenticate
-    oauth2_client = Qbo.get_client
-    callback = Setting.host_name + "/qbo/oauth_callback/" 
-    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
+    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
+    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
  
@@ -37,9 +37,9 @@ class QboController < ApplicationController
  #
  def oauth_callback
    if params[:state].present?
-      oauth2_client = Qbo.get_client
+      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.host_name + "/qbo/oauth_callback/"
+      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
@@ -47,17 +47,13 @@ class QboController < ApplicationController
        
        # Save the authentication information 
        qbo = Qbo.new
-        qbo.company_id = params[:realmId]
-        
-        # Generate Access Token & Serialize it into the database
-        access_token = OAuth2::AccessToken.new(oauth2_client, resp.token, refresh_token: resp.refresh_token)
-        qbo.token = access_token.to_hash
-        qbo.expire = 1.hour.from_now.utc
+        qbo.update(oauth2_access_token: resp.token, oauth2_refresh_token: resp.refresh_token, realm_id: params[:realmId])
+        qbo.refresh_token!
        
        if qbo.save!
-          redirect_to sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+          redirect_to qbo_sync_path, flash: { notice: I18n.t(:label_connected) }
        else
-          redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
+          redirect_to plugin_settings_path(:redmine_qbo), flash: { error: I18n.t(:label_error) }
        end
        
      end
@@ -69,9 +65,9 @@ class QboController < ApplicationController
    i = Issue.find_by_id params[:id]
    if i.customer
      i.bill_time
-      redirect_to i, :flash => { :notice => "Successfully Billed #{i.customer.name}" }
+      redirect_to i, flash: { notice: I18n.t(:label_billed_success) + i.customer.name }
    else
-      redirect_to i, :flash => { :error => "Cannot bill without a customer assigned" }
+      redirect_to i, flash: { error: I18n.t(:label_billing_error) }
    end
  end
  
@@ -88,46 +84,48 @@ class QboController < ApplicationController
    
    # proceed if the request is good
    if hash.eql? signature
-      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.debug "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!
+      Thread.new do
+        if request.headers['content-type'] == 'application/json'
+          data = JSON.parse(data)
        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")
+          # 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
-      
-      # Record that last time we updated
-      Qbo.update_time_stamp
-      
      # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true
+      render nothing: true, status: 200
    else
      render nothing: true, status: 400
    end
@@ -145,7 +143,6 @@ class QboController < ApplicationController
      if Qbo.exists?
        Customer.sync
        Invoice.sync
-        QboItem.sync
        Employee.sync
        Estimate.sync
        
@@ -155,6 +152,6 @@ class QboController < ApplicationController
      ActiveRecord::Base.connection.close
    end

-    redirect_to :home, :flash => { :notice => "Successfully synced to Quickbooks" }
+    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
  end
 end
--- a/app/controllers/vehicles_controller.rb
+++ b/app/controllers/vehicles_controller.rb
@@ -1,126 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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.
-
-# This controller class will handle map management
-class VehiclesController < ApplicationController
-  unloadable
-
-  include AuthHelper
-
-  before_action :require_user
-
-  def allowed_params
-    params.require(:vehicle).permit(:year, :make, :model, :customer_id, :notes, :vin)
-  end
-
-  # display a list of all vehicles
-  def index
-    if params[:customer_id]
-      begin
-        @vehicles = Customer.find_by_id(params[:customer_id]).vehicles.paginate(:page => params[:page])
-      rescue ActiveRecord::RecordNotFound
-        render_404
-      end
-    end
-
-    # search for a vehicle by vin
-    if params[:search]
-      @vehicles = Vehicle.search(params[:search]).paginate(:page => params[:page])
-      if only_one_non_zero?(@vehicles)
-        redirect_to @vehicles.first
-      end
-    end
-  end
-
-  # return an HTML form for creating a new vehicle
-  def new
-    @vehicle = Vehicle.new
-    @customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
-  end
-
-  # create a new vehicle
-  def create
-    @vehicle = Vehicle.new(allowed_params)
-    if @vehicle.save
-      flash[:notice] = "New Vehicle Created"
-      redirect_to @vehicle
-    else
-      flash[:error] = @vehicle.errors.full_messages.to_sentence
-      redirect_to Vehicle.find_by_vin @vehicle.vin
-    end
-  end
-
-  # display a specific vehicle
-  def show
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
-      @issues = @vehicle.issues.order(id: :desc)
-      @closed_issues = (@issues - @issues.open)
-    rescue 
-      render_404
-    end
-  end
-
-  # return an HTML form for editing a vehicle
-  def edit
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      @customer = @vehicle.customer
-    rescue 
-      render_404
-    end
-  end
-
-  # update a specific vehicle
-  def update
-    @customer = params[:customer]
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(allowed_params)
-        flash[:notice] = "Vehicle updated"
-        redirect_to @vehicle
-      else
-        redirect_to edit_vehicle_path
-      end
-      #show any errors anyways
-      flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
-    rescue 
-      render_404
-    end
-  end
-
-  # delete a specific vehicle
-  def destroy
-    begin
-      Vehicle.find_by_id(params[:id]).destroy
-      flash[:notice] = "Vehicle deleted successfully"
-      redirect_to action: :index
-    rescue 
-      render_404
-    end
-  end
-
-  private
-
-  # checks to see if there is only one item in an array
-  # @return true if array only has one item
-  def only_one_non_zero?( array )
-    found_non_zero = false
-    array.each do |val|
-      if val!=0
-        return false if found_non_zero
-        found_non_zero = true
-      end
-    end
-    found_non_zero
-  end
-
-end
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -13,7 +13,8 @@ module AuthHelper
  def require_user
    return unless session[:token].nil?
    if !User.current.logged?
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true
+      flash[:error] = t :notice_forbidden
+      render_403
    end
  end
  
@@ -27,14 +28,16 @@ module AuthHelper
  
  def check_permission(permission)
    if !allowed_to?(permission)
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+      flash[:error] = t :notice_forbidden
+      render_403
    end
  end
  
  
  def global_check_permission(permission)
    if !globaly_allowed_to?(permission)
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+      flash[:error] = t :notice_forbidden
+      render_403
    end
  end
  
--- a/app/models/concerns/quickbooks_oauth.rb
+++ b/app/models/concerns/quickbooks_oauth.rb
@@ -0,0 +1,88 @@
+#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 QuickbooksOauth
+  extend ActiveSupport::Concern
+
+  #== Instance Methods
+
+  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}")
+
+      # to prevent an infinite loop here keep a counter and bail out after N times...
+      attempts += 1
+
+      raise "QuickbooksOauth:ExceededAuthAttempts" if attempts >= 3
+
+      # check if its an invalid_grant first, but assume it is for now
+      refresh_token!
+
+      retry
+    end
+  end
+
+  def refresh_token!
+    Rails.logger.info("QuickbooksOauth.refresh_token!")
+    t = oauth_access_token
+    refreshed = t.refresh!
+
+    if refreshed.params['x_refresh_token_expires_in'].to_i > 0
+      oauth2_refresh_token_expires_at = Time.now + refreshed.params['x_refresh_token_expires_in'].to_i.seconds
+    else
+      oauth2_refresh_token_expires_at = 100.days.from_now
+    end
+
+    Rails.logger.info("QuickbooksOauth.refresh_token!: #{oauth2_refresh_token_expires_at}")
+
+    update!(
+      oauth2_access_token: refreshed.token,
+      oauth2_access_token_expires_at: Time.at(refreshed.expires_at),
+      oauth2_refresh_token: refreshed.refresh_token,
+      oauth2_refresh_token_expires_at: oauth2_refresh_token_expires_at
+    )
+  end
+
+  def oauth_client
+    self.class.construct_oauth2_client
+  end
+
+  def oauth_access_token
+    OAuth2::AccessToken.new(oauth_client, oauth2_access_token, refresh_token: oauth2_refresh_token)
+  end
+
+  def consumer
+    oauth_access_token
+  end
+
+  module ClassMethods
+
+    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
+      logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}"
+
+      options = {
+        site: "https://appcenter.intuit.com/connect/oauth2",
+        authorize_url: "https://appcenter.intuit.com/connect/oauth2",
+        token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
+      }
+      OAuth2::Client.new(oauth_consumer_key, oauth_consumer_secret, options)
+    end
+
+  end
+end
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,21 +9,18 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 class Customer < ActiveRecord::Base
-  unloadable
  
  has_many :issues
-  has_many :purchases
  has_many :invoices
  has_many :estimates
-  has_many :vehicles
-  
+ 
  validates_presence_of :id, :name
  
  self.primary_key = :id
  
  # returns a human readable string
  def to_s
-    return name
+    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
  end
  
  # Convenience Method
@@ -87,6 +84,13 @@ class Customer < ActiveRecord::Base
    #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
@@ -135,28 +139,28 @@ class Customer < ActiveRecord::Base
  # proforms a bruteforce sync operation
  # This needs to be simplified
  def self.sync 
-    service = Qbo.get_base(:customer)
-
    # Sync ALL customers if the database is empty
-    #if count == 0
-      customers = service.all
-    #else
-    #  last = Qbo.first.last_sync
-    #  query = "Select Id, DisplayName From Customer"
-    #  query << " Where Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
-    #  customers = service.query(query)
-    #end
+    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
    
-    customers.each do |customer|
-      customer = Customer.find_or_create_by(id: customer.id)
-      if customer.active?
-        if not customer.name.eql? customer.display_name
-          customer.name = customer.display_name
-          customer.id = customer.id
+    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
+        #end
      else
-        if not customer.new_record?
+        if not c.new_record?
          customer.delete
        end
      end
@@ -172,16 +176,23 @@ class Customer < ActiveRecord::Base
  # proforms a bruteforce sync operation
  # This needs to be simplified
  def self.sync_by_id(id) 
-    service = Qbo.get_base(:customer)
+    qbo = Qbo.first
+    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

-    customer = service.fetch_by_id(id)
-    customer = Customer.find_or_create_by(id: customer.id)
-    if customer.active?
-      if not customer.name.eql? customer.display_name
-        customer.name = customer.display_name
-        customer.id = customer.id
+    return unless c
+
+    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
+      #end
    else
      if not customer.new_record?
        customer.delete
@@ -192,7 +203,11 @@ class Customer < ActiveRecord::Base
  # Push the updates
  def save_with_push
    begin
-      @details = Qbo.get_base(:customer).update(@details)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
+        service.update(@details)
+      end
      #raise "QBO Fault" if @details.fault?
      self.id = @details.id
    rescue Exception => e
@@ -210,7 +225,11 @@ class Customer < ActiveRecord::Base
  def pull
    begin
      raise Exception unless self.id
-      @details = Qbo.get_base(:customer).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = 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(self.id)
+      end
    rescue Exception => e
      @details = Quickbooks::Model::Customer.new
    end
--- a/app/models/customer_token.rb
+++ b/app/models/customer_token.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,7 +9,7 @@
 #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
-  unloadable
+  
  has_many :issues
  validates_presence_of :issue_id
  before_create :generate_token, :generate_expire_date
@@ -55,7 +55,7 @@ class CustomerToken < ActiveRecord::Base
    end

    # only create new token if we have an issue to attach it to
-    return create(:issue_id => issue.id) if User.current.logged?
+    return create(issue_id: issue.id) if User.current.logged?
  end

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

 class Employee < ActiveRecord::Base
-  unloadable
+  
  has_many :users
  validates_presence_of :id, :name
  
-  def self.get_base
-    Qbo.get_base(:employee)
-  end
-  
  def self.sync 
-    employees = get_base.all
+    qbo = Qbo.first
+    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 { |employee|
-        employee = 	find_or_create_by(id: employee.id)
-        employee.name = employee.display_name
-        employee.id = employee.id
+      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

  def self.sync_by_id(id)
-    employee = get_base.fetch_by_id(id)
+    qbo = Qbo.first
+    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
--- a/app/models/estimate.rb
+++ b/app/models/estimate.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,22 +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.

 class Estimate < ActiveRecord::Base
-  unloadable
  
  has_and_belongs_to_many :issues
  belongs_to :customer 
  validates_presence_of :doc_number, :id
  self.primary_key = :id
-  
-  # return the QBO Estimate service
-  def self.get_base
-    Qbo.get_base(:estimate)
+
+  # returns a human readable string
+  def to_s
+    return self[:doc_number]
  end
  
  # sync all estimates
  def self.sync
-    logger.debug "Syncing ALL estimates"
-    estimates = get_base.all
+    logger.info "Syncing ALL estimates"
+    qbo = Qbo.first
+    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
+
    estimates.each { |estimate|
      process_estimate(estimate)
    }
@@ -35,36 +41,59 @@ class Estimate < ActiveRecord::Base
  
  # sync only one estimate
  def self.sync_by_id(id)
-    logger.debug "Syncing estimate #{id}"
-    process_estimate(get_base.fetch_by_id(id))
+    logger.info "Syncing estimate #{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}"
+    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
-    estimate = get_base.fetch_by_id(id)
-    estimate = find_or_create_by(id: id)
-    estimate.doc_number = estimate.doc_number
-    estimate.txn_date = estimate.txn_date
-    estimate.save!
+    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(estimate)
-    logger.info "Processing estimate #{estimate.id}"
-    estimate = find_or_create_by(id: estimate.id)
-    estimate.doc_number = estimate.doc_number
-    estimate.customer_id = estimate.customer_ref.value
-    estimate.id = estimate.id
-    estimate.txn_date = estimate.txn_date
+  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
-    base = Estimate.get_base
-    estimate = base.fetch_by_id(id)
-    return base.pdf(estimate)
+    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
@@ -91,7 +120,11 @@ class Estimate < ActiveRecord::Base
  def pull
    begin
      raise Exception unless self.id
-      @details = Qbo.get_base(:estimate).fetch_by_id(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
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,20 +9,20 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 class Invoice < ActiveRecord::Base
-  unloadable
+  
  has_and_belongs_to_many :issues
  belongs_to :customer 
  validates_presence_of :doc_number, :id, :customer_id, :txn_date
  self.primary_key = :id
-  
-  # Get the quickbooks-ruby base for invoice
-  def self.get_base
-    Qbo.get_base(:invoice)
+
+   # returns a human readable string
+  def to_s
+    return self[:doc_number]
  end
  
  # sync ALL the invoices
  def self.sync
-    logger.debug "Syncing all invoices"
+    logger.info "Syncing all invoices"
    last = Qbo.first.last_sync

    query = "SELECT Id, DocNumber FROM Invoice"
@@ -30,11 +30,13 @@ class Invoice < ActiveRecord::Base
  
    # TODO actually do something with the above query
    # .all() is never called since count is never initialized
-    if count == 0
-      invoices = get_base.all 
-    else
-      invoices = get_base.query()
+    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 | 
      process_invoice invoice
@@ -43,9 +45,13 @@ class Invoice < ActiveRecord::Base
  
  #sync by invoice ID
  def self.sync_by_id(id)
-    logger.debug "Syncing invoice #{id}"
-    invoice = get_base.fetch_by_id(id) 
-    process_invoice invoice
+    logger.info "Syncing invoice #{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
@@ -57,7 +63,7 @@ class Invoice < ActiveRecord::Base
    # 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.debug "Attaching invoice #{invoice.id} to issue #{issue.id}"
+    logger.info "Attaching invoice #{invoice.id} to issue #{issue.id}"
    
    invoice = Invoice.find_or_create_by(id: invoice.id)

@@ -70,26 +76,26 @@ class Invoice < ActiveRecord::Base
  end
  
  # processes the invoice into the database
-  def self.process_invoice(invoice)
-    logger.info "Processing invoice #{invoice.id}"
+  def self.process_invoice(i)
+    logger.info "Processing invoice #{i.id}"

    # Load the invoice into the database
-    invoice = Invoice.find_or_create_by(id: invoice.id)
-    invoice.doc_number = invoice.doc_number 
-    invoice.id = invoice.id
-    invoice.customer_id = invoice.customer_ref
-    invoice.txn_date = invoice.txn_date
+    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 invoice.private_note.nil?
-      invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
+    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
-    invoice.line_items.each { |line|
+    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)
@@ -104,58 +110,50 @@ class Invoice < ActiveRecord::Base
  # 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.debug "Comparing custom fields"
+    logger.info "Comparing custom fields"
    # TODO break if Invoice.find(invoice.id).cf_sync_confict
    is_changed = false
-    
-    # update the invoive custom fields with infomation from the issue if available
-    invoice.custom_fields.each { |cf|
-      
-      # VIN from the attached vehicle
-      # TODO move this into seperate plugin
-      # TODO create hook for seperate plugin 
-      begin
-        if cf.name.eql? "VIN"
-          # Only update if blank to prevent infite loops
-          # TODO check cf_sync_confict flag once implemented
-          if cf.string_value.to_s.blank?
-            logger.debug " VIN was blank, updating the invoice vin in quickbooks"
-            vin = Vehicle.find(issue.vehicles_id).vin
-            break if vin.nil?
-            if not cf.string_value.to_s.eql? vin
-              cf.string_value = vin.to_s
-              logger.debug "VIN has changed"
-              is_changed = true
-            end

-          end
-        end
-      rescue
-        #do nothing
-      end
-      
-      # 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
-    }
+    logger.debug "Calling :process_invoice_custom_fields hook"
+    context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice } 

-    # Push updates
+    # 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
-      logger.debug "Trying to update invoice"
-      get_base.update(invoice) if is_changed
+      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
@@ -165,6 +163,16 @@ class Invoice < ActiveRecord::Base
    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)
@@ -187,7 +195,11 @@ class Invoice < ActiveRecord::Base
  def pull
    begin
      raise Exception unless self.id
-      @details = Qbo.get_base(:invoice).fetch_by_id(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
--- a/app/models/qbo.rb
+++ b/app/models/qbo.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,86 +9,16 @@
 #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 Qbo < ActiveRecord::Base
-  unloadable
-  validates_presence_of :token, :company_id, :expire
-  serialize :token
-
-  OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
-  
-  #
-  # Getter for quickbooks OAuth2 client
-  #
-  def self.get_client
-    oauth_params = {
-     site: "https://appcenter.intuit.com/connect/oauth2",
-     authorize_url: "https://appcenter.intuit.com/connect/oauth2",
-     token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
-    }
-    return OAuth2::Client.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, oauth_params)
-  end
-  
-  #
-  # Getter for oauth consumer
-  #
-  def self.get_oauth_consumer
-    # Quickbooks Config Info
-    return $qb_oauth_consumer
-  end
-
-  # 
-  # Get a quickbooks base service object for type
-  # @params type of base
-  #
-  def self.get_base(type)
-    # lets getnourbold access token from the database
-    oauth2_client = get_client
-    qbo = self.first
-    access_token = OAuth2::AccessToken.from_hash(oauth2_client, qbo.token)
-
-    # check to see if we need to refresh the acesstoken
-    if qbo.expire.to_time.utc.past?
-      puts "Updating access token"
-      new_access_token_object = access_token.refresh!
-      qbo.token = new_access_token_object.to_hash
-      qbo.expire = 1.hour.from_now.utc
-      qbo.save!
-      access_token = new_access_token_object
-    else
-      puts "Using current token"
-    end
    
-    # build the reqiested service
-    case type
-      when :item
-        return Quickbooks::Service::Item.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :time_activity
-       return Quickbooks::Service::TimeActivity.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :customer
-        return Quickbooks::Service::Customer.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :invoice
-        return Quickbooks::Service::Invoice.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :estimate
-        return Quickbooks::Service::Estimate.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :account
-        return Quickbooks::Service::Account.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :employee
-        return Quickbooks::Service::Employee.new(:company_id => qbo.company_id, :access_token => access_token)
-    else
-      return access_token
-    end
-   
-  end
-   
-   # Get the QBO account
-  def self.get_account
-    first
-  end
+  include QuickbooksOauth
+  include Redmine::I18n
  
  # Updates last sync time stamp
  def self.update_time_stamp
+    date = DateTime.now
+    logger.info "Updating QBO timestamp to #{date}"
    qbo = Qbo.first
-    qbo.last_sync = DateTime.now
+    qbo.last_sync = date
    qbo.save
  end
  
--- a/app/models/vehicle.rb
+++ b/app/models/vehicle.rb
@@ -1,100 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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 Vehicle < ActiveRecord::Base
-  
-  unloadable
-  
-  belongs_to :customer
-  has_many :issues, :foreign_key => 'vehicles_id'
-  
-  validates_presence_of :customer
-  validates :vin, uniqueness: true
-  before_save :decode_vin
-  
-  self.primary_key = :id
-  
-  # returns a human readable string
-  def to_s
-    if year.nil? or make.nil? or model.nil?
-      return "#{vin}"
-    else
-      split_vin = vin.scan(/.{1,9}/)
-      return "#{year} #{make} #{model} - #{split_vin[1]}"
-    end
-  end
-  
-  # returns the raw JSON details from NHTSA
-  def details
-    get_details if @details.nil?
-    return @details
-  end
-  
-  # Force Upper Case for make numbers
-  def make=(val)
-    # The to_s is in case you get nil/non-string
-    write_attribute(:make, val.to_s.titleize)
-  end
-  
-  # Force Upper Case for model numbers
-  def model=(val)
-    # The to_s is in case you get nil/non-string
-    write_attribute(:model, val.to_s.titleize)
-  end
-  
-  # Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
-  def vin=(val)
-    val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
-    write_attribute(:vin, val)
-  end
-  
-  # search for a vin
-  def self.search(search)
-    where("vin LIKE ?", "%#{search}%")
-  end
-	
-  # decodes a vin and updates self
-  def decode_vin
-    get_details
-    if @details
-      begin
-        self.year = @details.year unless @details.year.nil?
-        self.make = @details.make unless @details.make.nil?
-        self.model = @details.model unless @details.model.nil?
-        self.doors = @details.doors unless @details.doors.nil?
-        self.trim = @details.trim unless @details.trim.nil?
-      rescue Exception => e
-        errors.add(:vin, e.message)
-      end
-    end
-    self.name = to_s
-  end
-  
-  private
-  
-  # init method to pull JSON details from NHTSA
-  def get_details
-    if self.vin?
-      #validate the vin before calling a remote server
-      validation = NhtsaVin.validate(self.vin)
-      begin
-        #if the vin validation failed, raise an exception and exit
-        raise RuntimeError, validation.error unless validation.valid?
-        # query NHTSA for details on the vin
-        query = NhtsaVin.get(self.vin)
-        raise RuntimeError, query.error unless query.valid?
-        @details = query.response
-      rescue Exception => e
-        errors.add(:vin, e.message)
-      end
-    end
-  end
-  
-end
--- a/app/views/customers/_actions.html.erb
+++ b/app/views/customers/_actions.html.erb
@@ -0,0 +1,11 @@
+<%= 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}&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank %>
+
+<br/>
+<br/>
+
+<%= button_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank, method: :get %>
+
+<br/>
+<br/>
+
+<%= button_to t(:label_edit_customer), edit_customer_path(@customer), method: :get%> 
--- a/app/views/customers/_details.html.erb
+++ b/app/views/customers/_details.html.erb
@@ -1,5 +1,11 @@
 <table>
  <tbody>
+
+    <tr>
+      <th><%=t(:label_name)%></th>
+      <td><%= customer.name %></td>
+    </tr>
+
    <tr>
      <th><%=t(:label_email)%></th>
      <td><%= customer.email %></td>
@@ -31,13 +37,24 @@
    </tr>
    
    <tr>
-      <th><%=t(:field_notes)%></th>
-      <td><%= customer.notes %></td>
+      <th colspan="2"><h4><%=t(:field_notes)%></hr></th>
    </tr>
+
+    <tr>
+      <td colspan="2">
+       <pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit;">
+          <%= customer.notes %>
+        </pre>
+      </td>
+    </tr>
+
+    <script>
+        const preElement = document.getElementById('note-display');
+        // This takes the text, trims the edges, and puts it back
+        preElement.textContent = preElement.textContent.trim();
+      </script>
+
  </tbody>
-</table>
-<div style="float: right;">
-  <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
-</div> 
+</table> 
 <br/>
 <br/>
--- a/app/views/customers/_form.html.erb
+++ b/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,17 +36,16 @@
          <%=t(:field_notes)%>: 
          <div class="input">
            <p>  
-              <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @customer.new_record? %>
-              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@customer.new_record? ? nil : 'display:none') do %>
+              <%= content_tag :span, id: "issue_description_and_toolbar" do %>
              <%= f.text_area :notes,
-                    :cols => 60,
-                    :rows => 10,
-                    :accesskey => accesskey(:edit),
-                    :class => 'wiki-edit',
-                    :no_label => true %>
+                    cols: 60,
+                    rows: 10,
+                    accesskey: accesskey(:edit),
+                    class: 'wiki-edit',
+                    no_label: true %>
              <% end %>
            </p>
-            <%= wikitoolbar_for 'issue_description' %>
+            <%= wikitoolbar_for :issue_description %>
          </div>
        </div>
        
--- a/app/views/customers/_search.html.erb
+++ b/app/views/customers/_search.html.erb
@@ -1,6 +1,5 @@
-<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+<%= form_tag(customers_path, method: "get", id: "search-form") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
    <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>
-<%= button_to(t(:label_sync), qbo_sync_path, method: :get) if User.current.admin?%>
--- a/app/views/customers/_sidebar.html.erb
+++ b/app/views/customers/_sidebar.html.erb
@@ -1,2 +1,2 @@
 <h3><%=t(:label_customers)%></h3>
-<%= render :partial => 'customers/search' %>
+<%= render partial: 'customers/search' %>
--- a/app/views/customers/edit.html.erb
+++ b/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' %>
--- a/app/views/customers/filter_estimates_by_customer.js.erb
+++ b/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) %>');
--- a/app/views/customers/filter_vehicles_by_customer.js.erb
+++ b/app/views/customers/filter_vehicles_by_customer.js.erb
@@ -1 +0,0 @@
-$('select#issue_vehicles_id').html('<%= j content_tag(:option,'',:value=>"")+options_from_collection_for_select(@filtered_vehicles, :id, :to_s) %>');
--- a/app/views/customers/index.html.erb
+++ b/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>
--- a/app/views/customers/new.html.erb
+++ b/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' %>
--- a/app/views/customers/show.html.erb
+++ b/app/views/customers/show.html.erb
@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </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">
@@ -7,36 +7,47 @@

        <h4><%=t(:label_details)%>:</h4>

-        <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+        <!-- Customer Info -->
+
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <h4><%=t(:field_customer)%>:</h4>
+            <%= render partial: 'customers/details', locals: {customer: @customer} %>
+          </div>
+
+          <div class="splitcontentleft">
+            <h4><%=t(:label_actions)%>:</h4>
+            <%= render partial: 'customers/actions', locals: {customer: @customer} %>
+          </div>
+        </div>
+
+
+        <!-- QBO Info -->

        <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>

      </div>
        
      <div class="splitcontentleft">
-        <h4><%=t(:field_vehicles)%>:</h4>
-        <%= render :partial => 'vehicles/list' %>
-        <div style="float: right;">
-          <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
-        </div>
+        <%= call_hook :show_customer_view_right, {customer: @customer} %>
      </div>
    </div>

  </div>

 <br/>
-<h3><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
+<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>

-<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
+<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} %>
--- a/app/views/customers/view.html.erb
+++ b/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_priority), @issue.priority.name, :class => 'priority'
-  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_status), @issue.status.name, class: :status
+  rows.left l(:field_priority), @issue.priority.name, class: :priority
+  # 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'
+  # 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?)
-    rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category'
+  unless @issue.disabled_core_fields.include?(:fixed_version_id) || (@issue.fixed_version.nil? && @issue.assignable_versions.none?)
+    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?)
-    rows.left l(:field_fixed_version), (@issue.fixed_version ? @issue.fixed_version : "-"), :class => 'fixed-version'
+  unless @issue.disabled_core_fields.include?(:start_date)
+    rows.right l(:field_start_date), format_date(@issue.start_date), class: 'start-date'
  end
-  unless @issue.disabled_core_fields.include?('start_date')
-    rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
+  unless @issue.disabled_core_fields.include?(:due_date)
+    rows.right l(:field_due_date), format_date(@issue.due_date), class: 'due-date'
  end
-  unless @issue.disabled_core_fields.include?('due_date')
-    rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
+  unless @issue.disabled_core_fields.include?(:done_ratio)
+    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')
-    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')
+  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 %>

--- a/app/views/estimates/_list.html.erb
+++ b/app/views/estimates/_list.html.erb
@@ -1,6 +1,6 @@
-<% if @customer.present? %>
+<% unless estimates.empty? %>

-  <% @customer.estimates.order(doc_number: :desc).each do |estimate| %>
+  <% estimates.sort.reverse.each do |estimate| %>
    <div class="row">
      <b><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b> <%= estimate.txn_date %>
    </div>
--- a/app/views/estimates/_search.html.erb
+++ b/app/views/estimates/_search.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag("/qbo/estimate/doc", :method => "get", id: "est-search-form") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), :autocomplete => "off" %>
-    <%= submit_tag t(:label_search), :formtarget => "_blank" %>
+<%= form_tag(estimate_doc_path, method: "get") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), autocomplete: "off" %>
+    <%= submit_tag t(:label_search), formtarget: "_blank" %>
 <% end %>
--- a/app/views/estimates/_sidebar.html.erb
+++ b/app/views/estimates/_sidebar.html.erb
@@ -1,2 +1,2 @@
 <h3><%=t(:label_estimates) %></h3>
-<%= render :partial => 'estimates/search' %>
+<%= render partial: 'estimates/search' %>
--- a/app/views/invoices/_list.html.erb
+++ b/app/views/invoices/_list.html.erb
@@ -1,9 +1,25 @@
-<% if @customer.present? %>
+<% unless invoices.empty? %>

-  <% @customer.invoices.order(doc_number: :desc).each do |invoice| %>
-    <div class="row">
-      <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
-    </div>
+  <%= form_with(url: invoice_path, method: :get) do |form| %>
+
+    <% 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 %>
+
+    <% invoices.sort.reverse.each do |invoice| %>
+      <div class="row">
+        <%= check_box_tag "invoice_ids[]", invoice.id, false, class: "invoice-checkbox" if invoices.count > 1 %>
+        <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
+      </div>
+    <% end %>
+
+    <% if invoices.count > 1 %>
+      <%= form.submit t(:button_bulk_pdf) %>
+    <% end %>
  <% end %>

 <% else %>
--- a/app/views/issues/_form_hook.html.erb
+++ b/app/views/issues/_form_hook.html.erb
@@ -2,13 +2,8 @@
    <label for="issue_customer"><%= t(:customer) %></label>
    <%= search_customer %> 
    <%= customer_id %> 
-    <%= link_to_function(t(:label_load_customer), "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)") %>
 </p> 

 <p>
    <%= select_estimate %>
 </p> 
-
-<p>
-    <%= vehicle %>
-</p>
--- a/app/views/issues/_history.html.erb
+++ b/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") %>
-      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+      <%= avatar(journal.user, size: "24") %>
+      <%= 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) %>
--- a/app/views/issues/_list_simple.html.erb
+++ b/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>
--- a/app/views/issues/_show_details.html.erb
+++ b/app/views/issues/_show_details.html.erb
@@ -17,19 +17,6 @@
   </div>
      
  <div class="splitcontentleft">
-    <div class="vehicle attribute">
-      <div class="label"><span><%=t(:field_vehicle)%></span>:</div>
-      <div class="value"><%= vehicle %></div>
-    </div>
-       
-    <div class="vehicle_vin attribute">
-      <div class="label"><span><%=t(:field_vin)%></span>:</div>
-      <div class="value"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div>
-    </div>
-       
-    <div class="vehicle_notes attribute">
-      <div class="label"><span><%=t(:field_notes)%></span>:</div>
-      <div class="value"><%=notes%></div>
-    </div>
+    <%= call_hook :show_issue_view_right, {issue: issue} %>
  </div>
 </div>
--- a/app/views/public/401.html.erb
+++ b/app/views/public/401.html.erb
@@ -1 +0,0 @@
-<%= flash.now[:error] = t(:label_401) %>
--- a/app/views/qbo/_footer.html.erb
+++ b/app/views/qbo/_footer.html.erb
@@ -0,0 +1,3 @@
+"<div id='footer' align='center'>
+    <b><%=I18n.translate(:label_last_sync)%>: </b> <%=Qbo.last_sync if Qbo.exists?%>
+</div>"
--- a/app/views/qbo/_settings.html.erb
+++ b/app/views/qbo/_settings.html.erb
@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)

-Copyright (c) 2022 rick barrette
+Copyright (c) 2016 - 2026 rick barrette

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -15,7 +15,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

 <!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
 <script>
-  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Setting.host_name %>/qbo/authenticate'});
+  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_path %>'});
 </script>

 <table >
@@ -57,9 +57,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
      </td>
    </tr>

+    <tr>
+      <th><%=t(:label_sandbox)%></th>
+      <td>
+        <%= 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.expire end %>
+        <th><%=t(:label_oauth_expires)%></th>
+        <td><%= if Qbo.exists? then Qbo.first.oauth2_access_token_expires_at end %>
+      </tr>
+      
+      <tr>
+        <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
+        <td><%= if Qbo.exists? then Qbo.first.oauth2_refresh_token_expires_at end %>
     </tr>

  </tbody>
--- a/app/views/qbo/_sidebar.html.erb
+++ b/app/views/qbo/_sidebar.html.erb
@@ -1,6 +1,6 @@
 <% if User.current.logged? %>

-    <%= render :partial => 'customers/sidebar' %>
-    <%= render :partial => 'estimates/sidebar' %>
+    <%= render partial: 'customers/sidebar' %>
+    <%= render partial: 'estimates/sidebar' %>

 <% end %>
--- a/app/views/qbo/_stats.html.erb
+++ b/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' %>
--- a/app/views/qbo/authenticate.html.erb
+++ b/app/views/qbo/authenticate.html.erb
@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)

-Copyright (c) 2016 rick barrette
+Copyright (c) 2016 - 2026 rick barrette

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/app/views/qbo/oauth_callback.html.erb
+++ b/app/views/qbo/oauth_callback.html.erb
@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)

-Copyright (c) 2016 rick barrette
+Copyright (c) 2016 - 2026 rick barrette

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/app/views/qbo/webhook.erb
+++ b/app/views/qbo/webhook.erb
@@ -0,0 +1,13 @@
+<!--
+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.
+-->
+
+<h2>QboController#webhook</h2>
--- a/app/views/vehicles/_details.html.erb
+++ b/app/views/vehicles/_details.html.erb
@@ -1,45 +0,0 @@
-<div class="issue">
-  <div class="splitcontent">
-    <div class="splitcontentleft">
-      <h4><%=t(:label_details)%>:</h4>
-      
-      <table>
-        <tbody>
-
-          <tr>
-            <th><%= t(:field_customer)%></th>
-            <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
-          </tr>
-        
-          <tr>
-            <th><%= t(:field_vehicle) %></th>
-            <td><%= vehicle.to_s %></td>
-          </tr>
-          
-          <tr>
-            <th><%= t(:field_vin) %></th>
-            <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
-          </tr>
-          
-          <th><%= t(:label_trim) %></th>
-            <td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
-          </tr>
-        </tbody>
-      </table>
-      
-    </div>
-
-    <div class="splitcontentleft">
-
-      <h4><%=t(:field_notes)%>:</h4>
-        <td><%= vehicle.notes %></td>
-      </tr>
-
-    </div>
-  </div>
-</div>
-
-<div style="float: right;">
-  <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
-  <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
-</div>
--- a/app/views/vehicles/_form.html.erb
+++ b/app/views/vehicles/_form.html.erb
@@ -1,56 +0,0 @@
-<div class="row">
-  <div class="span6 columns">
-    <fieldset>
-
-      <%= form_for @vehicle do |f| %> 
-        <div class="clearfix">
-          <%=t(:field_customer)%>:
-          <div class="input">
-            <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
-            <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_year)%>: 
-          <div class="input">
-            <%= f.number_field :year, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_make)%>:
-          <div class="input">
-            <%= f.text_field :make, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_model)%>:
-          <div class="input">
-            <%= f.text_field :model, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:field_vin)%>:
-          <div class="input">
-            <%= f.text_field :vin , :autofocus => true %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:field_notes)%>: 
-          <div class="input">
-            <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
-          </div>
-        </div>
-        
-       <div class="actions">
-        <%= f.submit %>
-       </div>
-      <% end %>
-
-    </fieldset>
-  </div>
-</div>
--- a/app/views/vehicles/_list.html.erb
+++ b/app/views/vehicles/_list.html.erb
@@ -1,28 +0,0 @@
-<% if @vehicles.present? %>
-
-  <% @vehicles.each do |vehicle| %>
-    <div class="row">
-      <div>
-        <b><%= link_to "##{vehicle.id}", vehicle_path(vehicle) %> </b>
-      </div>
-      
-      <div>
-        <%= vehicle.to_s %>
-        <br/>
-        <%= vehicle.customer %>
-        <br/>
-        <%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
-      </div>
-    </div>
-    <br/>
-  <% end %>
-
-  <div class="actions">
-    <%= will_paginate @vehicles %>
-  </div>
-
-<p><%=t(:label_matching)%> <%=@vehicles.count%> <%=t(:field_vehicles) %> </p>
-
-<% else %>
-  <p><%=t(:label_no_vehicles)%> <%= params[:search] %>.</p>
-<% end %>
--- a/app/views/vehicles/_search.html.erb
+++ b/app/views/vehicles/_search.html.erb
@@ -1,4 +0,0 @@
-<%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), :autocomplete => "off" %>
-  <%= submit_tag t(:label_search) %>
-<% end %>
--- a/app/views/vehicles/_vehicle.html.erb
+++ b/app/views/vehicles/_vehicle.html.erb
@@ -1 +0,0 @@
-<option value="<%= vehicle.id %>"><%= vehicle.to_s.titleize %></option>
--- a/app/views/vehicles/edit.html.erb
+++ b/app/views/vehicles/edit.html.erb
@@ -1,3 +0,0 @@
-<h1><%=t(:label_edit_customer_vehicle)%></h1> 
-<br/> 
-<%= render :partial => 'vehicles/form' %>
--- a/app/views/vehicles/index.html.erb
+++ b/app/views/vehicles/index.html.erb
@@ -1,4 +0,0 @@
-<h2><%=t(:label_cusomer_vehicles)%> <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2> 
-<br/> 
-
-<%= render :partial => 'vehicles/list' %>
--- a/app/views/vehicles/new.html.erb
+++ b/app/views/vehicles/new.html.erb
@@ -1,3 +0,0 @@
-<h2><%=t(:label_new_vehicle)%></h2> 
-<br/> 
-<%= render :partial => 'vehicles/form' %>
--- a/app/views/vehicles/show.html.erb
+++ b/app/views/vehicles/show.html.erb
@@ -1,11 +0,0 @@
-<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%></h2>
-
-<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
-
-<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
-
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
-
-<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
-
-<%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>
--- a/assets/images/.gitkeep
+++ b/assets/images/.gitkeep
--- a/assets/javascripts/.gitkeep
+++ b/assets/javascripts/.gitkeep
--- a/assets/javascripts/application.js
+++ b/assets/javascripts/application.js
@@ -1,23 +0,0 @@
-$(function() {
-  $("input#issue_customer_id").on("change", function() {
-    $.ajax({
-      url: "/filter_vehicles_by_customer",
-      type: "GET",
-      data: { selected_customer: $("input#issue_customer_id").val() }
-    });
-    
-    $.ajax({
-      url: "/filter_estimates_by_customer",
-      type: "GET",
-      data: { selected_customer: $("input#issue_customer_id").val() }
-    });
-  });
-    
-  $("input#project_customer_id").on("change", function() {
-    $.ajax({
-      url: "/filter_vehicles_by_customer",
-      type: "GET",
-      data: { selected_customer: $("input#project_customer_id").val() }
-    });
-  });
-});
--- a/assets/javascripts/checkbox_controller.js
+++ b/assets/javascripts/checkbox_controller.js
@@ -0,0 +1,17 @@
+document.addEventListener('DOMContentLoaded', () => {
+  const select_all_invoice = document.getElementById('select-all-invoices');
+  const invoices = document.querySelectorAll('.invoice-checkbox');
+
+  if (select_all_invoice) {
+    select_all_invoice.addEventListener('change', (e) => {
+      invoices.forEach(item => item.checked = e.target.checked);
+    });
+  }
+
+  invoices.forEach(item => {
+    item.addEventListener('change', () => {
+      const allChecked = Array.from(invoices).every(i => i.checked);
+      select_all_invoice.checked = allChecked;
+    });
+  });
+});
--- a/assets/stylesheets/.gitkeep
+++ b/assets/stylesheets/.gitkeep
--- a/config/initializers/.gitkeep
+++ b/config/initializers/.gitkeep
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,33 +12,23 @@
 # Usage I18n.t(:label)
 en:
  field_customer: "Customer"
-  field_item: "Item"
  field_employee: "Employee"
  field_invoice: "Invoice"
  field_estimate: "Estimate" 
-  field_vehicles: "Vehicles"
-  field_vehicle: "Vehicle"
-  field_vin: "VIN"
  field_notes: "Notes"
  field_billed: "Billed"
  label_week: "Week"
  label_search_estimates: "Search Estimates"
  label_search: "Search"
  label_estimates: "Estimates"
-  label_401: "Not Authorized"
  warn_ru_sure: "You sure?"
  label_delete: "Delete"
  label_edit: "Edit"
  label_year: "Year"
  label_make: " Make"
  label_model: "Model"
-  label_no_vehicles: "There are no vehicles containing the term(s)"
  label_no_customers: "There are no customers containing the term(s)"
  label_matching: "Matching "
-  label_search_vin: "Search Vehicles by VIN"
-  label_edit_customer_vehicle: "Edit Customer Vehicle"
-  label_cusomer_vehicles: "Customer Vehicles"
-  label_new_vehicle: "New Customer Vehicle"
  label_open_issues: "Open Issues"
  label_closed_issues: "Closed Issues"
  label_sync: "Sync"
@@ -63,7 +53,6 @@ en:
  label_customer_count: "Customer Count"
  label_invoice_count: "Invoice Count"
  label_estimate_count: "Estimate Count"
-  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"
@@ -87,4 +76,27 @@ en:
  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_appointment: "Add Appointment"
+  label_actions: "Actions"
+  label_create_estimate: "Create Estimate"
+  label_syncing: "Syncing Quickbooks"
+  label_sandbox: "Sandbox"
+  button_bulk_pdf: "Bulk PDF"
+  label_select_all: "Select All"
+  notice_customer_created: "Customer created in Quickbooks"
+  notice_customer_updated: "Customer updated in Quickbooks"
+  notice_customer_not_found: "Customer not found in Quickbooks"
+  notice_customer_not_deleted: "Customer could not be deleted in Quickbooks"
+  notice_customer_deleted: "Customer deleted in Quickbooks"
+  notice_estimate_created: "Estimate created in Quickbooks"
+  notice_estimate_updated: "Estimate updated in Quickbooks"
+  notice_estimate_not_found: "Estimate not found"
+  notice_invoice_created: "Invoice created in Quickbooks"
+  notice_invoice_updated: "Invoice updated in Quickbooks"
+  notice_invoice_not_found: "Invoice not found"
+  notice_forbidden: "You do not have permission to access this resource"
+  notice_issue_not_found: "Issue not found"
+  customer_details: "Customer Details"
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,37 +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/oauth_callback', :to => 'qbo#oauth_callback'
+get 'qbo/authenticate', to: 'qbo#authenticate'
+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/doc/:id', :to => 'estimate#doc', as: :estimate_doc
-get 'invoices/:id', :to => 'invoice#show', as: :invoice
+get 'estimates/:id', to: 'estimate#show', as: :estimate
+get 'estimates/doc/', to: 'estimate#doc', as: :estimate_doc
+get 'invoices/:id', to: 'invoice#show', as: :invoice

 #manual billing
-get 'bill/:id', :to => 'qbo#bill', as: :bill
+get 'bill/:id', to: 'qbo#bill', as: :bill

 #customer issue view
-get 'customers/view/:token', :to => 'customers#view', as: :view
-get 'customers/share/:id', :to => 'customers#share', as: :share
+get 'customers/view/:token', to: 'customers#view', as: :view
+get 'customers/share/:id', to: 'customers#share', as: :share

 #java script routes
-get 'filter_vehicles_by_customer' => 'customers#filter_vehicles_by_customer'
 get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
 get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'

-# Nest Vehicles under customers
 resources :customers do
-  resources :vehicles
-  get :autocomplete_customer_name, :on => :collection
+  get :autocomplete_customer_name, on: :collection
 end
-
-#allow for just vehicles too
-resources :vehicles
--- a/db/migrate/001_create_qbos.rb
+++ b/db/migrate/001_create_qbos.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/002_create_qbo_customers.rb
+++ b/db/migrate/002_create_qbo_customers.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/003_update_issues.rb
+++ b/db/migrate/003_update_issues.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/004_create_qbo_items.rb
+++ b/db/migrate/004_create_qbo_items.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/005_create_qbo_employees.rb
+++ b/db/migrate/005_create_qbo_employees.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/006_update_users.rb
+++ b/db/migrate/006_update_users.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/007_update_time_entries.rb
+++ b/db/migrate/007_update_time_entries.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/008_create_qbo_estimates.rb
+++ b/db/migrate/008_create_qbo_estimates.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/009_update_qbos.rb
+++ b/db/migrate/009_update_qbos.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/010_update_issues_with_estimates.rb
+++ b/db/migrate/010_update_issues_with_estimates.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/011_create_qbo_invoices.rb
+++ b/db/migrate/011_create_qbo_invoices.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/012_update_issues_with_invoices.rb
+++ b/db/migrate/012_update_issues_with_invoices.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/013_create_qbo_purchases.rb
+++ b/db/migrate/013_create_qbo_purchases.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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
--- a/db/migrate/014_update_customers.rb
+++ b/db/migrate/014_update_customers.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/015_update_qbo_purchases.rb
+++ b/db/migrate/015_update_qbo_purchases.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/017_update_issues_with_vehicles.rb
+++ b/db/migrate/017_update_issues_with_vehicles.rb
@@ -1,15 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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 UpdateIssuesWithVehicles < ActiveRecord::Migration[5.1]
-  def change
-    add_reference :issues, :vehicles, index: true
-  end
-end
--- a/db/migrate/018_update_vehicles.rb
+++ b/db/migrate/018_update_vehicles.rb
@@ -1,15 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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 UpdateVehicles < ActiveRecord::Migration[5.1]
-  def change
-    add_column :vehicles, :name, :text
-  end
-end
--- a/db/migrate/019_qbocustomers_to_customers.rb
+++ b/db/migrate/019_qbocustomers_to_customers.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,6 +12,5 @@ class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
  def change
    rename_table :qbo_customers, :customers
    rename_column :issues, :qbo_customer_id, :customer_id
-    rename_column :vehicles, :qbo_customer_id, :customer_id
  end 
 end
--- a/db/migrate/020_update_qbos_time_stamp.rb
+++ b/db/migrate/020_update_qbos_time_stamp.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/021_add_issues_qbo_invoices.rb
+++ b/db/migrate/021_add_issues_qbo_invoices.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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"
--- a/db/migrate/022_update_issues_remove_invoice.rb
+++ b/db/migrate/022_update_issues_remove_invoice.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/023_create_customer_tokens.rb
+++ b/db/migrate/023_create_customer_tokens.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/024_update_invoices_and_estimates.rb
+++ b/db/migrate/024_update_invoices_and_estimates.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/025_update_projects.rb
+++ b/db/migrate/025_update_projects.rb
@@ -1,16 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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 UpdateProjects < ActiveRecord::Migration[5.1]
-  def change
-    add_reference :projects, :customer, index: true
-    add_reference :projects, :vehicle, index: true
-  end
-end
--- a/db/migrate/026_create_line_items.rb
+++ b/db/migrate/026_create_line_items.rb
@@ -1,6 +1,6 @@
 #The License
 #
-#Copyright (c) 2022 Rick Barrette - All Rights Reserved
+#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.
 #
--- a/db/migrate/027_add_customers_phone_number.rb
+++ b/db/migrate/027_add_customers_phone_number.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/028_add_customers_mobile_phone_number.rb
+++ b/db/migrate/028_add_customers_mobile_phone_number.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/029_update_qbos_types.rb
+++ b/db/migrate/029_update_qbos_types.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/030_update_qbos_token.rb
+++ b/db/migrate/030_update_qbos_token.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/031_remove_qbos_keys.rb
+++ b/db/migrate/031_remove_qbos_keys.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/032_add_txn_dates.rb
+++ b/db/migrate/032_add_txn_dates.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -9,35 +9,46 @@
 #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 AddTxnDates < ActiveRecord::Migration[5.1]
+
  def change
-    add_column :qbo_invoices, :txn_date, :date
-    add_column :qbo_estimates, :txn_date, :date
+    begin
+      add_column :qbo_invoices, :txn_date, :date
+      add_column :qbo_estimates, :txn_date, :date

-    reversible do |direction|
-      direction.up {
-        break unless Qbo.first
+      reversible do |direction|
+        direction.up {
+          break unless Qbo.first

-        QboEstimate.reset_column_information
-        QboInvoice.reset_column_information
+          QboEstimate.reset_column_information
+          QboInvoice.reset_column_information

-        say "Sync Estimates"
+          say "Sync Estimates"

-        QboEstimate.sync
+          QboEstimate.sync

-        say "Sync Invoices"
+          say "Sync Invoices"

-        invoices = QboInvoice.get_base.all
+          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

-        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!
+          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

--- a/db/migrate/034_remove_qbo_items.rb
+++ b/db/migrate/034_remove_qbo_items.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/035_drop_qbo_prefix.rb
+++ b/db/migrate/035_drop_qbo_prefix.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/036_remove_qbo_time_entries.rb
+++ b/db/migrate/036_remove_qbo_time_entries.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
--- a/db/migrate/033_update_vehicles_trim.rb
+++ b/db/migrate/033_update_vehicles_trim.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,23 +8,15 @@
 #
 #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 UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
+class UpdateQboToken < ActiveRecord::Migration[5.1]
  def change
-    add_column :vehicles, :doors, :text
-    add_column :vehicles, :trim, :text
-
-    reversible do |direction|
-      direction.up {
-
-        # Update local vehicle database by forcing a save, look at before_save
-        vehicles = Vehicle.all
-        vehicles.each { |vehicle|
-            vehicle.save!
-        }
-
-      }
-    end
-
+    add_column :qbos, :oauth2_access_token, :text
+    add_column :qbos, :oauth2_access_token_expires_at, :datetime
+    add_column :qbos, :oauth2_refresh_token, :text
+    add_column :qbos, :oauth2_refresh_token_expires_at, :datetime
+    add_column :qbos, :realm_id, :text
+    remove_column :qbos, :company_id
+    remove_column :qbos, :token
+    remove_column :qbos, :expire
  end
-
 end
--- a/init.rb
+++ b/init.rb
@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2016 - 2026 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,50 +8,41 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-# Dynamically load all Hooks & Patches
-ActiveSupport::Reloader.to_prepare do
-  Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file|
-    next unless /\.rb$/ =~ file
-    require_dependency file
-  end
-end
-
 Redmine::Plugin.register :redmine_qbo do
  
  # About
-  name 'Redmine Quickbooks Online 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'
-  version '1.1.4'
+  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.2.0'
  url 'https://github.com/rickbarrette/redmine_qbo'
-  author_url 'http://rickbarrette.org'
-  settings :default => {'empty' => true}, :partial => 'qbo/settings'
-  requires_redmine :version_or_higher => '4.0.0'
+  author_url 'https://barrettefabrication.com'
+  settings default: {empty: true}, partial: 'qbo/settings'
+  requires_redmine version_or_higher: '6.1.0'
  
  # Add safe attributes for core models
-  Issue.safe_attributes 'customer_id'
-  Issue.safe_attributes 'item_id'
-  Issue.safe_attributes 'estimate_id'
-  Issue.safe_attributes 'invoice_id'
-  Issue.safe_attributes 'vehicles_id'
-  User.safe_attributes 'employee_id'
-  TimeEntry.safe_attributes 'billed'
-  Project.safe_attributes 'customer_id'
-  Project.safe_attributes 'vehicle_id'
-
-  # We are playing in the sandbox 
-  #Quickbooks.sandbox_mode = true
-
+  Issue.safe_attributes :customer_id
+  Issue.safe_attributes :estimate_id
+  Issue.safe_attributes :invoice_id
+  User.safe_attributes :employee_id
+  TimeEntry.safe_attributes :billed
+  
  # set per_page globally
  WillPaginate.per_page = 20

  # Permissions for security
-  permission :view_customers, :customers => :index, :public => false
-  permission :add_customers, :customers => :new, :public => false
-  permission :view_vehicles, :vehicles => :new, :public => false
-
+  permission :view_customers, customers: :index, 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, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
+  menu :top_menu, :customers, { controller: :customers, action: :index }, caption: :label_customers, if: Proc.new {User.current.logged?}
    
 end
+
+# Dynamically load all Hooks & Patches recursively
+base_dir = File.join(File.dirname(__FILE__), 'lib')
+
+# '**' looks inside subdirectories, '*.rb' matches Ruby files
+Dir.glob(File.join(base_dir, '**', '*.rb')).sort.each do |file|
+  require file
+end
--- a/lib/header_footer_hook_listener.rb
+++ b/lib/header_footer_hook_listener.rb
@@ -1,19 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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 HeaderFooterHookListener < Redmine::Hook::ViewListener
-
-  def view_layouts_base_html_head(context = {})
-    #nothing
-  end
-
-  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>"
-  end
-end
--- a/lib/issue_patch.rb
+++ b/lib/issue_patch.rb
@@ -1,108 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 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'
-
-# 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
-      unloadable # Send unloadable so it will not be unloaded in development
-      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
-      belongs_to :vehicle, primary_key: :id
-    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
-        time_service = Qbo.get_base(:time_activity)
-        item_service = Qbo.get_base(:item)
-        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
-  
-  # Create a shareable link for a customer
-  def share_token
-    CustomerToken.get_token self
-  end
-  
-end  
-
-# Add module to Issue
-Issue.send(:include, IssuePatch)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rick Barrette	e35a2148eb	2026.2.0	2026-02-06 19:37:32 -05:00
Rick Barrette	c8f115ae02	removed unused js	2026-02-06 19:28:42 -05:00
Rick Barrette	d59e52b111	removed subject from logs	2026-02-06 18:58:16 -05:00
Rick Barrette	2c3548d1ac	Added logging	2026-02-06 18:55:49 -05:00
Rick Barrette	d80007bc84	Titleize the subject before save , but keep words containing numbers mixed with letters capitalized	2026-02-06 18:52:11 -05:00
Rick Barrette	b030f85b74	Botton_to didn't work for google cal link	2026-02-04 21:39:18 -05:00
Rick Barrette	2f0ee6a6d6	refoactored hooks and patches under RedmineQbo module	2026-02-04 07:18:25 -05:00
Rick Barrette	637cfa89b4	Refactored view hooks	2026-02-03 22:52:34 -05:00
Rick Barrette	c36f4c905b	moved issue hooks into issue_patch	2026-02-03 22:42:08 -05:00
Rick Barrette	83fb20044d	updated plugin description	2026-01-31 22:10:23 -05:00
Rick Barrette	928e632dd3	converted links to buttons	2026-01-31 21:02:22 -05:00
Rick Barrette	8b9cf5066e	only show checkboxes if more then 1 invoices	2026-01-31 20:44:15 -05:00
Rick Barrette	45bfce87d8	2026.1.9	2026-01-31 13:02:21 -05:00
Rick Barrette	6f33e9d23d	Inverted conditionals in estimates and invoices lists to use 'unless'	2026-01-31 12:54:07 -05:00
Rick Barrette	92460392b9	Refactor estimates and invoices rendering to use local variables for the abilty for other plugins to display filtered lists	2026-01-31 12:45:47 -05:00
Rick Barrette	f1bdf59697	Add customer details translation and fix link in appointment action	2026-01-30 23:05:23 -05:00
Rick Barrette	60e2f1d2b0	2026.1.8	2026-01-30 21:30:28 -05:00
Rick Barrette	6c9ae82f81	fixed typo	2026-01-30 21:22:08 -05:00
Rick Barrette	42e4494f6e	fixed entity, they need strings	2026-01-30 21:17:17 -05:00
Rick Barrette	7e0b2c9d09	Removed unused folders	2026-01-30 20:51:09 -05:00
Rick Barrette	5ca68b01b6	removed unsued tests	2026-01-30 20:46:04 -05:00
Rick Barrette	ebd4fa7363	Add flash error messages for forbidden access in permission checks	2026-01-30 20:40:57 -05:00
Rick Barrette	e6818958ae	Add I18n support for flash messages and update locale file with new notices	2026-01-30 20:19:12 -05:00
Rick Barrette	5b31459629	use a symbol for empty	2026-01-30 19:28:33 -05:00
Rick Barrette	92de2928f6	Merge branch 'master' into symbols	2026-01-30 17:12:11 -05:00
Rick Barrette	a8af180de2	2026.1.7	2026-01-30 17:09:34 -05:00
Rick Barrette	e621dc9e3a	nil not nill	2026-01-30 17:00:29 -05:00
Rick Barrette	c3d7c1c867	Use symbols	2026-01-30 16:58:14 -05:00
Rick Barrette	defeec7f8e	2026.1.6	2026-01-30 07:53:51 -05:00
Rick Barrette	37c302e274	use symbol keys	2026-01-30 07:53:29 -05:00
Rick Barrette	006e907b35	need to supply selected id	2026-01-30 07:53:14 -05:00
Rick Barrette	f1f77a8022	use locale	2026-01-30 07:42:09 -05:00
Rick Barrette	ff358d806e	2026.1.5	2026-01-30 07:22:11 -05:00
Rick Barrette	b80e1d4e28	loose the hash rocket, use symbol keys	2026-01-29 22:30:59 -05:00
Rick Barrette	f24128ef75	Cleaned up Issue Show Hook	2026-01-29 21:53:18 -05:00
Rick Barrette	d3a8c05f50	Added missing to_s method	2026-01-29 21:36:50 -05:00
Rick Barrette	f023cd246d	Titlize new issue subjects	2026-01-29 21:18:15 -05:00
Rick Barrette	b7e18a3c3f	Cleaned up Issue Form Hook	2026-01-29 21:12:32 -05:00
Rick Barrette	67f2dbf4d8	Removed reduntant onchange js call to update issue	2026-01-28 17:35:12 -05:00
Rick Barrette	924aa7657b	Fixed typo	2026-01-28 10:11:28 -05:00
Rick Barrette	16fe07f177	Fixed typo	2026-01-28 08:50:37 -05:00
Rick Barrette	9257b2f938	2026.1.4	2026-01-28 08:42:33 -05:00
Rick Barrette	0227681e92	Added hook list to README	2026-01-28 08:41:55 -05:00
Rick Barrette	c034696810	Disabled showing assinee to customer	2026-01-28 08:38:02 -05:00
Rick Barrette	ffdabccd84	Updated README with information about plugin hooks	2026-01-28 08:18:29 -05:00
Rick Barrette	1f03908040	Refactor employee and estimate models by removing redundant comments; update locale file to remove item references; delete unused QboItemTest file.	2026-01-28 07:45:20 -05:00
Rick Barrette	43a5317b4e	Removed DEVELOPMENT from plugin name	2026-01-28 07:03:08 -05:00
Rick Barrette	4c49ec6890	2026.1.3	2026-01-27 21:17:17 -05:00
Rick Barrette	ef7faee685	Process updates from the hooks	2026-01-27 20:50:54 -05:00
Rick Barrette	02b48d2de4	Dont add reference for customers to projects	2026-01-27 18:07:37 -05:00
Rick Barrette	e670d99766	Removed project level intergration	2026-01-27 18:01:42 -05:00
Rick Barrette	241dd594d0	Fixed pdf hooks	2026-01-26 23:22:23 -05:00
Rick Barrette	b603cb634a	Version Bump 2026.1.2	2026-01-26 22:59:48 -05:00
Rick Barrette	1308a05011	Removed Load Customer Link	2026-01-26 21:00:16 -05:00
Rick Barrette	334ed60bf7	removed extra comma	2026-01-26 20:14:01 -05:00
Rick Barrette	d63bf809f2	Merge branch 'redmine-6' into dev-6	2026-01-26 10:16:40 -05:00
Rick Barrette	31406af681	Version bump 2026.1.1	2026-01-26 10:09:24 -05:00
Rick Barrette	479be461a6	Dynamically load updateIssueFrom javascript path	2026-01-26 10:08:53 -05:00
Rick Barrette	c1af031d22	Link to sandbox if enabled	2026-01-23 21:40:08 -05:00
Rick Barrette	a741cd0217	update readme	2026-01-22 21:54:03 -05:00
Rick Barrette	4ae9374401	Merge branch 'redmine-6' into dev-6	2026-01-22 21:50:40 -05:00
Rick Barrette	b096244454	Better display of customer note	2026-01-22 21:50:17 -05:00
Rick Barrette	4983cd661c	Fixed missing locale	2026-01-22 21:49:33 -05:00
Rick Barrette	5f6fb4af27	Only show select all when more than one invoice	2026-01-22 21:29:08 -05:00
Rick Barrette	2f2c74403f	Bug fixes	2026-01-22 21:20:47 -05:00
Rick Barrette	43579d73e5	Merge remote-tracking branch 'origin/hooks' into dev-6	2026-01-22 20:58:06 -05:00
Rick Barrette	a90d6b839f	Updated readme	2026-01-22 20:57:09 -05:00
Rick Barrette	e76f977ca8	Removed Vehicles	2026-01-22 20:54:06 -05:00
Rick Barrette	7f821d241c	Removed typo	2026-01-22 20:47:31 -05:00
Rick Barrette	1bc9227c7f	finish redmine-6 merge into dev	2026-01-22 20:43:06 -05:00
Rick Barrette	3c2f1d0edd	Merge branch 'redmine-6' into HEAD	2026-01-22 20:39:20 -05:00
Rick Barrette	35e303d54b	Migrated hard coded strings to locales	2026-01-21 20:49:54 -05:00
Rick Barrette	2aeb3fa028	Updated copyright dates	2026-01-21 20:40:06 -05:00
Rick Barrette	c85e45b544	Print attached estimate	2026-01-21 20:29:38 -05:00
Rick Barrette	6cd7825430	Added pdf method	2026-01-21 20:28:54 -05:00
Rick Barrette	14f411c2e1	Moved hooks & patches into sperate folders	2026-01-21 19:35:08 -05:00
Rick Barrette	623510b474	Finaly got the issue form javascrip reloading to work	2026-01-21 12:20:43 -05:00
Rick Barrette	20d9f0a84e	update readme	2026-01-20 21:41:58 -05:00
Rick Barrette	f741ce5dc9	Fixed displaying of notes	2026-01-20 21:40:17 -05:00
Rick Barrette	72ec89292f	Added onclick to load customer link	2026-01-20 21:15:25 -05:00
Rick Barrette	b54eb86b7f	Moved javascript into ViewLayoutsHookListener	2026-01-20 21:02:40 -05:00
Rick Barrette	f74f3ad72e	Select All Invoices For Bulk PDF	2026-01-20 20:49:03 -05:00
Rick Barrette	0647b7708f	Udated README & Copyright Date	2026-01-20 13:49:38 -05:00
Rick Barrette	7d644f0619	Dynamically load all Hooks & Patches	2026-01-20 08:12:34 -05:00
Rick Barrette	b712c328ba	Remove logging	2026-01-20 08:11:53 -05:00
Rick Barrette	5649ba05cd	Added Checkbox Controller javascript	2026-01-19 19:34:59 -05:00
Rick Barrette	bcdd515cf1	Remove view_layouts_base_body_bottom	2026-01-19 19:34:10 -05:00
Rick Barrette	704dff2a72	Multiple Invoices to PDF	2026-01-19 19:33:29 -05:00
Ricky Barrette	55d00f9005	Added sandbox to settings	2025-07-08 21:01:48 -04:00
Ricky Barrette	eba3f529f8	Set version & requirements	2025-07-08 20:19:19 -04:00
Rick Barrette	f0a3b0193c	Development mode Use the QBO sandbox & Display DEVEOMPENT in the plugin name	2025-06-18 08:30:21 -04:00
Ricky Barrette	19733c3f8c	Added gem rexml	2025-06-16 23:41:30 -04:00
Ricky Barrette	f22795ac90	Moved strings for notices to en.yml	2025-06-16 22:56:54 -04:00
Ricky Barrette	166a9ee31b	Removed has_many purchases, table doesn't exist anymore	2025-06-16 22:54:47 -04:00
Ricky Barrette	4d85c24872	generate redirect_uri protocol based one site settings	2025-06-16 22:30:30 -04:00
Ricky Barrette	43c7374c42	Load oauth key & secret when constructing client, not on application start up	2025-06-16 22:16:58 -04:00
Ricky Barrette	60857e9dca	generate redirect_uri protocol based one site settings	2025-06-16 22:15:42 -04:00
Ricky Barrette	d38f0d6ac1	Merge branch 'master' of https://github.com/rickbarrette/redmine_qbo	2025-06-15 19:03:59 -04:00
Ricky Barrette	f6da031e72	include Redmine::I18n	2025-06-15 18:59:00 -04:00
Rick Barrette	9779437c00	Log token refresh	2024-12-19 09:41:53 -05:00
Rick Barrette	1a37926628	Log error not info	2024-12-19 09:36:23 -05:00
Ricky Barrette	dac9a7c756	Started Support for Redmine 6	2024-12-12 06:00:36 -05:00
Rick Barrette	9ac1261ed0	Sort by id not doc_number This fixes the bug where documents were displayed out of order	2024-08-30 09:19:58 -04:00
Rick Barrette	9b69d3f728	Added link to customer profile for appointments	2024-08-26 11:00:50 -04:00
Rick Barrette	a5de879260	Fixed formatting	2024-08-26 08:41:56 -04:00
Rick Barrette	6464e1cbc6	Added actions	2024-08-26 07:58:40 -04:00
Rick Barrette	7f3a94229a	Create Estimate	2024-08-26 07:58:05 -04:00
Rick Barrette	395e0117fb	Update _actions.html.erb	2024-08-26 07:57:10 -04:00
Rick Barrette	e04d363e42	Added label for actions	2024-08-26 07:56:06 -04:00
Rick Barrette	3b6c0d4a70	Removed Action links	2024-08-26 07:52:27 -04:00
Rick Barrette	d1f6ccd9cb	Create _actions.html.erb	2024-08-26 07:51:38 -04:00
Ricky Barrette	74f7ba41df	Add Appointment Link	2024-08-21 21:39:50 -04:00
Ricky Barrette	4fb424faa8	Only sync by doc number if not in database	2024-08-20 07:14:37 -04:00
Ricky Barrette	63218e7f42	Fixed formating	2024-08-19 23:28:54 -04:00
Ricky Barrette	7f0bb3cae7	Removed extra end	2024-08-19 23:26:43 -04:00
Ricky Barrette	ad7417c233	Moved work into thread to repsond quickly	2024-08-19 23:21:56 -04:00
Ricky Barrette	cf0be2336b	Removed sync button from sidebar	2024-08-19 23:12:20 -04:00
Ricky Barrette	6e08746611	2.1.1 Force Estimate sync by Doc Number when searching	2024-08-19 22:51:53 -04:00
Ricky Barrette	7eb26facaf	Use the first result	2024-08-19 22:49:20 -04:00
Ricky Barrette	9115cc662c	Forgot params[:search]	2024-08-19 22:39:50 -04:00
Ricky Barrette	9e7c1dbfb2	removed ()	2024-08-19 22:38:16 -04:00
Ricky Barrette	e99f5d2e52	Added webhook view	2024-08-19 22:36:44 -04:00
Ricky Barrette	039d1ca993	Use Logger.info	2024-08-19 22:31:41 -04:00
Ricky Barrette	dd9ac3c481	Added Estimate.sync_by_doc_number	2024-08-19 22:30:34 -04:00
Ricky Barrette	4f789080e7	2.1.0 Bumped wrong versoin	2024-08-19 20:18:22 -04:00
Ricky Barrette	80fc858a35	send back status 200 if request succeeded	2024-08-19 20:14:02 -04:00
Ricky Barrette	6f8d280657	5.2.0 FIXED QBO Authentication	2024-08-19 20:06:13 -04:00
Ricky Barrette	5782cbc166	Added https	2024-08-19 20:04:09 -04:00
Ricky Barrette	0729d2ac41	added https to redirect_uri	2024-08-19 20:02:22 -04:00
Ricky Barrette	6c6de0ba86	Added log	2024-08-19 19:59:26 -04:00
Ricky Barrette	11dbcaf80c	Use Setting.host_name & path	2024-08-19 19:53:51 -04:00
Ricky Barrette	95592e542f	Use qbo_oauth_callback_path	2024-08-19 19:30:51 -04:00
Ricky Barrette	472bdec4fa	Use qbo_authenticate_path	2024-08-19 19:17:45 -04:00
Rick Barrette	c7a313e9ed	Add customer name to details	2024-04-03 11:47:38 -04:00
Rick Barrette	c14b590083	2024 Copy Right Update	2024-03-29 08:10:05 -04:00
Rick Barrette	040c920481	2.0.5	2024-03-29 07:58:26 -04:00
Rick Barrette	8c63817950	Use free_form_number	2024-03-28 14:13:39 -04:00
Rick Barrette	e2f43d398f	Nil Checks	2024-03-28 14:01:18 -04:00
Rick Barrette	7ba4829066	Update Customer Phone Numbers On Sync	2024-03-28 13:51:29 -04:00
Rick Barrette	938999db91	Added quickbooks to customer's name	2024-03-28 12:54:36 -04:00
Ricky Barrette	0b60a8e41b	2.0.4	2024-01-07 20:53:07 -05:00
Ricky Barrette	817a43e849	Fixed update	2024-01-07 20:47:26 -05:00
Ricky Barrette	047296329e	2.0.32.0.3	2023-12-31 16:42:47 -05:00
Ricky Barrette	c8cb74f3d4	Merge branch 'redmine-5'	2023-12-31 16:35:26 -05:00
Ricky Barrette	aceb6cb6b5	fixed typo	2023-12-31 16:26:02 -05:00
Ricky Barrette	b531076c18	Merge branch 'dev' into hooks	2023-12-30 23:43:10 -05:00
Ricky Barrette	9e342ced28	Merge branch 'master' into hooks	2023-12-30 23:40:08 -05:00
Ricky Barrette	9fd1bc9dff	Merge branch 'redmine-5'	2023-12-30 23:35:25 -05:00
Ricky Barrette	0537d9bd86	Merge branch 'master' into hooks	2023-12-30 23:18:55 -05:00
Ricky Barrette	04391f1c6e	2.0.2	2023-12-30 23:07:17 -05:00
Ricky Barrette	e2bf42e66b	Fixed invoice pdf	2023-12-30 23:04:43 -05:00
Ricky Barrette	0c72ca9294	missed this authenticated_request	2023-12-30 23:01:32 -05:00
Ricky Barrette	2985fad77c	Fixed typo	2023-12-30 23:01:01 -05:00
Ricky Barrette	02b5fb4d0e	Fixed returned variable handling	2023-12-30 22:53:08 -05:00
Ricky Barrette	bf417c163c	Rework performing authenticated requests	2023-12-30 22:33:28 -05:00
Ricky Barrette	b35974e455	2.0.1	2023-12-30 20:55:58 -05:00
Ricky Barrette	6d0abf865e	2023	2023-12-30 20:54:40 -05:00
Ricky Barrette	275af9be82	Fixed formatting	2023-12-30 20:53:39 -05:00
Ricky Barrette	f4e44a1975	Remove listen (was used for development env)	2023-12-30 20:29:20 -05:00
Ricky Barrette	81f322b616	Call refresh_token to set token time stamps	2023-12-30 20:26:30 -05:00
Ricky Barrette	f094ef57ec	Setter for notes	2023-12-30 20:08:36 -05:00
Ricky Barrette	2e32d8f6e5	Fixed get_base	2023-12-30 19:55:01 -05:00
Ricky Barrette	3e352f270d	Added Item	2023-12-30 19:41:02 -05:00
Ricky Barrette	45056e8ff4	Remove unsed columns	2023-12-30 19:28:04 -05:00
Ricky Barrette	b13abe51bf	Display token expiration times	2023-12-30 19:27:37 -05:00
Ricky Barrette	c3513427de	Used realm_id not comany_id	2023-12-30 19:13:08 -05:00
Ricky Barrette	7a6b6882d2	Update get_base	2023-12-30 18:53:01 -05:00
Ricky Barrette	d6ec34cef9	added realm_id	2023-12-30 12:56:46 -05:00
Ricky Barrette	84dfdd707a	fixed token names	2023-12-30 12:46:52 -05:00
Ricky Barrette	517a239485	Started reworking Oauth token sorage	2023-12-30 12:39:51 -05:00
Ricky Barrette	47868051f8	Rails 6.1 Deprecates update_attributes	2023-12-29 20:25:26 -05:00
Ricky Barrette	96e4e9df66	Fixed typo with params	2023-12-29 20:17:46 -05:00
Ricky Barrette	7d510e4028	Added notes to allowed params	2023-12-29 20:06:15 -05:00
Ricky Barrette	6760b29148	Log the time stamp	2023-12-29 19:20:31 -05:00
Ricky Barrette	122063b1d5	Fixed customer typo	2023-12-29 19:14:38 -05:00
Ricky Barrette	b304c3a175	Fixed employee typo	2023-12-29 19:09:24 -05:00
Ricky Barrette	5b89d73c20	Remove QboItem.sync	2023-12-29 18:56:20 -05:00
Ricky Barrette	8380dda25a	render 403 when forbidden	2023-12-29 17:06:00 -05:00
Ricky Barrette	7839116134	Version 2.0.0	2023-12-27 16:31:11 -05:00
Ricky Barrette	b3a809ab1c	Redmine 5.1 Update	2023-12-27 15:03:08 -05:00
Ricky Barrette	3a0e58c3da	Append last 4 of phone number to customers name	2023-05-22 07:34:18 -04:00
Ricky Barrette	26433c9020	Added hour totals to customer job history	2023-01-14 06:38:48 -05:00
Ricky Barrette	a531ef4f87	Added hour totals to customer job history	2023-01-14 06:20:41 -05:00
Rick Barrette	6dbf84f401	Added nil check to address_to_s	2022-05-04 12:37:31 -04:00
Rick Barrette	3220ff728f	Fixed process_estimate that I accidently broke	2022-04-06 12:45:40 -04:00
Ricky Barrette	1fae647381	Merge branch 'master' into dev	2022-03-19 05:49:54 -04:00
Ricky Barrette	d1764e2203	Removed Comment	2022-03-19 05:49:18 -04:00
Ricky Barrette	d8d1942673	Version 1.1.6	2022-03-19 05:47:07 -04:00
Ricky Barrette	8e329b2dd2	Fix broken invoice processing	2022-03-19 05:29:59 -04:00
Ricky Barrette	3622f8cad7	Added space	2022-03-19 05:16:26 -04:00
Ricky Barrette	f830881883	Don't need to pass customer, only issue	2022-03-17 06:52:46 -04:00
Ricky Barrette	fb87e8a33a	Added hook :show_issue_view_right	2022-03-17 06:45:57 -04:00
Ricky Barrette	8bdec410c4	Fixed render of hook :show_customer_view_right	2022-03-17 06:12:35 -04:00
Ricky Barrette	dec9eee90b	Merge branch 'master' into dev	2022-03-15 12:29:11 -04:00
Ricky Barrette	0513763607	Version 1.1.5	2022-03-14 19:41:53 -04:00
Ricky Barrette	b7e3ea9e3d	estimate not e	2022-03-14 19:39:36 -04:00
Ricky Barrette	3ea2cd14d1	Fixed accidental removal of qbo prefix	2022-03-14 19:33:20 -04:00
Ricky Barrette	7b7875991f	created get_estimate to remove redundant code	2022-03-14 19:28:40 -04:00
Ricky Barrette	b1a106d4d8	No id required	2022-03-14 19:27:31 -04:00
Ricky Barrette	0281d86f1a	No id required	2022-03-14 19:25:20 -04:00
Ricky Barrette	2231156873	use estimate_doc_path not a hard coded path	2022-03-14 19:01:20 -04:00
Ricky Barrette	2745ecf242	Added call_hook :show_customer_view_right	2022-03-14 07:52:33 -04:00
Ricky Barrette	13472c3b3a	Remove nhtsa_vin gem	2022-03-14 07:26:07 -04:00
Ricky Barrette	b686110145	Initial Vehicle Delete	2022-03-14 07:22:43 -04:00
Ricky Barrette	d91e7892c3	Added PDF hooks	2022-03-13 22:36:34 -04:00
Ricky Barrette	f26224de56	Created hook process_invoice_custom_fields	2022-03-13 20:06:13 -04:00
Ricky Barrette	ecc8930bec	Try to bill completed issue, TODO handle errors	2022-03-13 17:51:52 -04:00
Ricky Barrette	5814740a5d	Allow customer to view estimate	2022-03-13 17:49:58 -04:00
				`@@ -1 +0,0 @@`
				`$('select#issue_vehicles_id').html('<%= j content_tag(:option,'',:value=>"")+options_from_collection_for_select(@filtered_vehicles, :id, :to_s) %>');`
				`@@ -1 +0,0 @@`
				`<option value="<%= vehicle.id %>"><%= vehicle.to_s.titleize %></option>`