Process updates from the hooks

Use the QBO sandbox & Display DEVEOMPENT in the plugin name

Gemfile

@@ -6,6 +6,8 @@ gem 'roxml'
 gem 'will_paginate'
 gem 'rails-jquery-autocomplete'
 gem 'jquery-ui-rails'
+gem 'rexml'
+gem 'combine_pdf'
 
 group :assets do
   gem 'coffee-rails'

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2023 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

README.md

@@ -1,80 +1,109 @@
-# 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 for the following Redmine Versions
+## Compatibility
-* Version 2.0.0+ for Redmine 5+
-* Version 1.0.0+ for Redmine 4+ 
-* Version 0.8.1 for Redine 3
 
-#### Features
+| Plugin Version | Redmine Version |
-* 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
+| Version 2026.1.0+ | Redmine 6.1 |
-* Employee is assigned to a user via a drop down in the user admistration page.
+| Version 2.0.0+ | Redmine 5 |
-* IF an Issue has been assined a Customer when an Issue is closed the following will happen:
+| Version 1.0.0+ | Redmine 4 |
-  - A new Time Activity will be billed agaist the Customer assinged to the issue for each Redmine Time Entery. 
+| Version 0.8.1 | Redmine 3 |
-    + 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.
+## Features
-    + 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
+* **Customer Assignment:** Issues can be assigned to a Customer via a dropdown in the edit Issue form.
-* Customers Can be created via the New Customer Page
+    * Once a customer is attached to an Issue, you can attach an Estimate to the issue via a dropdown menu.
-  - Customers can be searched by name or phone number
+* **Employee Mapping:** An Employee is assigned to a Redmine User via a dropdown in the User Administration page.
-  - Basic information for the Customer can be viewed/edit via the Customer page
+* **Automatic Billing:** If an Issue has been assigned a Customer, the following happens when the Issue is closed:
-* Webhook Support
+    * A new Time Activity will be billed against the Customer assigned to the issue for each Redmine Time Entry.
-  - Invoices are automaticly attached to an Issue if a line item has a hashtag number in a Line Item
+    * Time Entries will be totalled up by Activity name. This allows billing for different activities without having to create separate Issues.
-    + 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.
+    * The Time Activity names are used to dynamically lookup Items in QuickBooks.
-  - Customers are automaticly updated in local database
+    * If there are no Items that match the Activity name, it will be skipped and will not be billed to the Customer.
+    * Labor Rates are set by the corresponding Item in QuickBooks.
+* **Customer Management:** Customers can be created via the New Customer Page.
+    * Customers can be searched by name or phone number.
+    * Basic information for the Customer can be viewed/edited via the Customer page.
+* **Webhook Support:**
+    * **Invoices:** Automatically attached to an Issue if a line item contains a hashtag number (e.g., `#123`).
+    * **Custom Fields:** Invoice Custom Fields are matched to Issue Custom Fields and are automatically updated in QuickBooks. (Useful for extracting Mileage In/Out from the Issue to update the Invoice).
+    * **Sync:** Customers are automatically updated in the local database.
 
 ## Prerequisites
 
-* Sign up to become a developer for Intuit https://developer.intuit.com/
+* Sign up to become a developer for Intuit: https://developer.intuit.com/
-* Create your own aplication to obtain your API keys
+* Create your own application to obtain your API keys.
-* Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
+* 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` 
+2.  **Install dependencies:** *Crucial for Redmine 6 / Rails 7 compatibility.*
     
-  then
+    Bash
     
-  `git checkout <tag>`
+    ```
+    bundle install
+    ```
     
-2. Migrate your database
+3.  **Migrate your database:**
     
-  `rake redmine:plugins:migrate RAILS_ENV=production`
+    Bash
     
-3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
+    ```
+    bundle exec rake redmine:plugins:migrate RAILS_ENV=production
+    ```
     
-4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
+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**.
         
-5. 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
+
+*   Add hooks to intergrate other plugins, i.e. customer vehicles for example
 *   MORE Stuff as I make it up...
     
+
 ## License
 
-The MIT License (MIT)
+> 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 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:
+> 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 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 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.

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
@@ -135,7 +134,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

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,7 +8,6 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class EstimateController < ApplicationController
-  unloadable
   
   include AuthHelper
   
@@ -16,6 +15,15 @@ class EstimateController < ApplicationController
   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

app/controllers/invoice_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,9 +8,9 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class InvoiceController < ApplicationController
-  unloadable
   
   include AuthHelper
+  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? }
@@ -19,13 +19,33 @@ class InvoiceController < ApplicationController
   # Downloads and forwards the invoice pdf
   #
   def show
+    logger.info("Processing request for URL: #{request.original_url}") 
     begin
       qbo = Qbo.first
         qbo.perform_authenticated_request do |access_token|
         service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        
+        # If multiple id's then pull each pdf & combine them
+        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)
-        send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+          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" }

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,6 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class QboController < ApplicationController
-  unloadable
   
   require 'openssl'
   
@@ -26,9 +25,10 @@ class QboController < ApplicationController
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
+    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
+    logger.info "redirect_uri: #{redirect_uri}"
     oauth2_client = Qbo.construct_oauth2_client
-    callback = Setting.host_name + "/qbo/oauth_callback/" 
+    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
-    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
     redirect_to grant_url
   end
   
@@ -39,7 +39,7 @@ class QboController < ApplicationController
     if params[:state].present?
       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
@@ -51,9 +51,9 @@ class QboController < ApplicationController
         qbo.refresh_token!
         
         if qbo.save!
-          redirect_to qbo_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
@@ -65,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
   
@@ -84,6 +84,7 @@ class QboController < ApplicationController
     
     # proceed if the request is good
     if hash.eql? signature
+      Thread.new do
         if request.headers['content-type'] == 'application/json'
           data = JSON.parse(data)
         else
@@ -96,7 +97,7 @@ class QboController < ApplicationController
           id = entity['id'].to_i
           name = entity['name']
         
-        logger.debug "Casting #{name.constantize} to obj"
+          logger.info "Casting #{name.constantize} to obj"
 
           # Magicly initialize the correct class
           obj = name.constantize
@@ -121,9 +122,10 @@ class QboController < ApplicationController
         
         # Record that last time we updated
         Qbo.update_time_stamp
-      
+        ActiveRecord::Base.connection.close
+      end
       # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true
+      render :nothing => true, status: 200
     else
       render nothing: true, status: 400
     end
@@ -150,6 +152,6 @@ class QboController < ApplicationController
       ActiveRecord::Base.connection.close
     end
 
-    redirect_to :home, :flash => { :notice => "Syncing Quickbooks" }
+    redirect_to :home, :flash => { :notice => I18n.t(:label_syncing) }
   end
 end

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

app/models/concerns/quickbooks_oauth.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,9 +11,6 @@
 module QuickbooksOauth
   extend ActiveSupport::Concern
 
-  OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
-
   #== Instance Methods
 
   def perform_authenticated_request(&block)
@@ -21,7 +18,7 @@ module QuickbooksOauth
     begin
       yield oauth_access_token
     rescue OAuth2::Error, Quickbooks::AuthorizationFailure => ex
-      Rails.logger.info("QuickbooksOauth.perform: #{ex.message}")
+      Rails.logger.error("QuickbooksOauth.perform: #{ex.message}")
 
       # to prevent an infinite loop here keep a counter and bail out after N times...
       attempts += 1
@@ -36,6 +33,7 @@ module QuickbooksOauth
   end
 
   def refresh_token!
+    Rails.logger.info("QuickbooksOauth.refresh_token!")
     t = oauth_access_token
     refreshed = t.refresh!
 
@@ -45,6 +43,8 @@ module QuickbooksOauth
       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),
@@ -68,12 +68,20 @@ module QuickbooksOauth
   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)
+      OAuth2::Client.new(oauth_consumer_key, oauth_consumer_secret, options)
     end
 
   end

app/models/customer.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,10 +9,8 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Customer < ActiveRecord::Base
-  unloadable
   
   has_many :issues
-  has_many :purchases
   has_many :invoices
   has_many :estimates
  
@@ -154,11 +152,13 @@ class Customer < ActiveRecord::Base
       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
+        #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 c.new_record?
           customer.delete
@@ -177,20 +177,22 @@ class Customer < ActiveRecord::Base
   # This needs to be simplified
   def self.sync_by_id(id) 
     qbo = Qbo.first
-    customer = qbo.perform_authenticated_request do |access_token|
+    c = qbo.perform_authenticated_request do |access_token|
       service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
       service.fetch_by_id(id)
     end
 
-    return unless customer
+    return unless c
 
-    customer = Customer.find_or_create_by(id: customer.id)
+    customer = Customer.find_or_create_by(id: c.id)
-    if customer.active?
+    if c.active?
-      if not customer.name.eql? customer.display_name
+      #if not customer.name.eql? c.display_name
-        customer.name = customer.display_name
+        customer.name = c.display_name
-        customer.id = customer.id
+        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
@@ -204,7 +206,7 @@ class Customer < ActiveRecord::Base
       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)
-        serivce.update(@details)
+        service.update(@details)
       end
       #raise "QBO Fault" if @details.fault?
       self.id = @details.id

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

app/models/employee.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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 Employee < ActiveRecord::Base
-  unloadable
+  
   has_many :users
   validates_presence_of :id, :name
   

app/models/estimate.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,6 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Estimate < ActiveRecord::Base
-  unloadable
   
   has_and_belongs_to_many :issues
   belongs_to :customer 
@@ -18,7 +17,7 @@ class Estimate < ActiveRecord::Base
   
   # sync all estimates
   def self.sync
-    logger.debug "Syncing ALL estimates"
+    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)
@@ -37,7 +36,7 @@ class Estimate < ActiveRecord::Base
   
   # sync only one estimate
   def self.sync_by_id(id)
-    logger.debug "Syncing estimate #{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)
@@ -45,6 +44,16 @@ class Estimate < ActiveRecord::Base
     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

app/models/invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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 Invoice < ActiveRecord::Base
-  unloadable
+  
   has_and_belongs_to_many :issues
   belongs_to :customer 
   validates_presence_of :doc_number, :id, :customer_id, :txn_date
@@ -17,7 +17,7 @@ class Invoice < ActiveRecord::Base
   
   # 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"
@@ -40,7 +40,7 @@ class Invoice < ActiveRecord::Base
   
   #sync by invoice ID
   def self.sync_by_id(id)
-    logger.debug "Syncing invoice #{id}"
+    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)
@@ -58,7 +58,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)
 
@@ -105,23 +105,22 @@ 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.info "Comparing custom fields"
-    logger.debug "Comparing custom fields"
     # TODO break if Invoice.find(invoice.id).cf_sync_confict
     is_changed = false
 
     logger.debug "Calling :process_invoice_custom_fields hook"
     context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
 
-    unless context.nil?
+    # Process updates from the hooks
-      logger.debug "We have a context!"
+    context.each do |c|
-      context= context.first
+      unless c.nil?
-      issue = context[:issue]
+        logger.debug "Invoice.compare_custom_fields: We have a responce from a hook"
-      invoice = context[:invoice]
+        push_updates  c[:invoice] if c[:is_changed]
-      is_changed = context[:is_changed]
+      end
     end
       
-    # Custom Values
+    # Process Issue Custom Values
     begin
       value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
       
@@ -138,13 +137,17 @@ class Invoice < ActiveRecord::Base
       # Nothing to do here, there is no match
     end
 
-    # Push updates
+    push_updates invoice if is_changed
+  end
+
+  # pushes invoice updates
+  def self.push_updates(invoice)
     begin
-      logger.debug "Trying to update invoice"
+      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) if is_changed
+        service.update invoice
       end
     rescue
       # Do nothing, probaly custome field sync confict on the invoice. 
@@ -155,6 +158,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)

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,9 +9,9 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Qbo < ActiveRecord::Base
-  unloadable
     
   include QuickbooksOauth
+  include Redmine::I18n
   
   # Updates last sync time stamp
   def self.update_time_stamp

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 "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/>
+
+<%= link_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank %>
+
+<br/>
+<br/>
+
+<%= button_to t(:label_edit_customer), edit_customer_path(@customer), method: :get%> 

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>
+      <th colspan="2"><h4><%=t(:field_notes)%></hr></th>
-      <td><%= customer.notes %></td>
     </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> 
 <br/>
 <br/>

app/views/customers/_form.html.erb

@@ -36,8 +36,7 @@
           <%=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" do %>
-              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@customer.new_record? ? nil : 'display:none') do %>
               <%= f.text_area :notes,
                     :cols => 60,
                     :rows => 10,

app/views/customers/_search.html.erb

@@ -3,4 +3,3 @@
     <%= 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?%>

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,7 +7,22 @@
 
         <h4><%=t(:label_details)%>:</h4>
 
+        <!-- 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">
@@ -24,7 +39,7 @@
       </div>
         
       <div class="splitcontentleft">
-        <% call_hook :show_customer_view_right %>
+        <%= call_hook :show_customer_view_right, {customer: @customer} %>
       </div>
     </div>
 

app/views/estimates/_list.html.erb

@@ -1,6 +1,6 @@
 <% if @customer.present? %>
 
-  <% @customer.estimates.order(doc_number: :desc).each do |estimate| %>
+  <% @customer.estimates.order(id: :desc).each do |estimate| %>
     <div class="row">
       <b><%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %></b> <%= estimate.txn_date %>
     </div>

app/views/invoices/_list.html.erb

@@ -1,11 +1,28 @@
 <% if @customer.present? %>
 
-  <% @customer.invoices.order(doc_number: :desc).each do |invoice| %>
+  <%= form_with(url: invoice_path, method: :get) do |form| %>
+
+    <% if @customer.invoices.count > 1 %>
+      <div class="form-check">
+        <%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
+        <%= label_tag "select-all-invoices", t(:label_select_all) %>
+      </div>
+
+      <hr>
+    <% end %>
+
+    <% @customer.invoices.order(id: :desc).each do |invoice| %>
       <div class="row">
+        <%= check_box_tag "invoice_ids[]", invoice.id, false, class: "invoice-checkbox"  %>
         <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
       </div>
     <% end %>
 
+    <% if @customer.invoices.count > 1 %>
+      <%= form.submit t(:button_bulk_pdf) %>
+    <% end %>
+  <% end %>
+
 <% else %>
   <p><%=t(:label_no_invoices)%>.</p>
 <% end %>

app/views/issues/_form_hook.html.erb

@@ -2,14 +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> %>
-    <%# <%= call_hook here %> %>
-<%# </p> %>

app/views/issues/_show_details.html.erb

@@ -17,6 +17,6 @@
    </div>
       
   <div class="splitcontentleft">
-    <%# call_hook here %>
+    <%= call_hook :show_issue_view_right, {issue: issue} %>
   </div>
 </div>

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,6 +57,13 @@ 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.oauth2_access_token_expires_at end %>

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:
 

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:
 

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>

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;
+    });
+  });
+});

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:
 #
@@ -80,4 +80,11 @@ en:
   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"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

db/migrate/025_update_projects.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 UpdateProjects < ActiveRecord::Migration[5.1]
-  def change
-    add_reference :projects, :customer, index: true
-  end
-end

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

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

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

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

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

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

db/migrate/032_add_txn_dates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,9 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class AddTxnDates < ActiveRecord::Migration[5.1]
+
   def change
+    begin
       add_column :qbo_invoices, :txn_date, :date
       add_column :qbo_estimates, :txn_date, :date
 
@@ -45,6 +47,9 @@ class AddTxnDates < ActiveRecord::Migration[5.1]
           }
         }
       end
+    rescue
+      logger.error "AddTxnDates Failed"
+    end
   end
 
 end

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

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

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

db/migrate/037_update_qbo_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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:
 #

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 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,25 +8,17 @@
 #
 #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 DEVELOPMENT 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 '2.0.2'
+  version '2026.1.2'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'
-  requires_redmine :version_or_higher => '5.1.0'
+  requires_redmine :version_or_higher => '6.1.0'
   
   # Add safe attributes for core models
   Issue.safe_attributes 'customer_id'
@@ -35,10 +27,6 @@ Redmine::Plugin.register :redmine_qbo do
   Issue.safe_attributes 'invoice_id'
   User.safe_attributes 'employee_id'
   TimeEntry.safe_attributes 'billed'
-  Project.safe_attributes 'customer_id'
-  
-  # We are playing in the sandbox 
-  #Quickbooks.sandbox_mode = true
   
   # set per_page globally
   WillPaginate.per_page = 20
@@ -51,3 +39,11 @@ Redmine::Plugin.register :redmine_qbo do
   menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => '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

lib/hooks/header_footer_hook_listener.rb

@@ -1,19 +1,19 @@
 #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:
 #
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Hooks
+
   class 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
+
+end

lib/hooks/issues_form_hook_listener.rb

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

lib/hooks/issues_save_hook_listener.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:
 #
@@ -8,32 +8,26 @@
 #
 #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 'project'
+module Hooks
 
-# Patches Redmine's Projects dynamically.
+  class IssuesSaveHookListener < Redmine::Hook::ViewListener
-# Adds a relationships
-module ProjectPatch
 
-  def self.included(base) # :nodoc:
+    # Called Before Issue Saved
-  base.extend(ClassMethods)
+    def controller_issues_edit_before_save(context={})
-
+      issue = context[:issue]
-  base.send(:include, InstanceMethods)
+      issue.subject = issue.subject.titleize
-
-  # 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
-  end
-  end
     end
 
-module ClassMethods
+    # Called After Issue Saved
+    def controller_issues_edit_after_save(context={})
+      issue = context[:issue]
+      begin
+        issue.bill_time if issue.status.is_closed?
+      rescue
+        # TODO flash[:error] = "Unable to bill, check QBO Auth"
+      end
+    end
 
   end
 
-module InstanceMethods
- 
 end
-  
-# Add module to Project
-Project.send(:include, ProjectPatch)

lib/hooks/issues_show_hook_listener.rb

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

lib/hooks/users_show_hook_listener.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,26 +8,22 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require_dependency 'time_entry_query'
+module Hooks
 
-module TimeEntryQueryPatch
+  class UsersShowHookListener < Redmine::Hook::ViewListener
 
-  # Add QBO options to columns
+    # View User
-  def available_columns
+    def view_users_form(context={})
-    unless @available_columns
+      
-      @available_columns = self.class.available_columns.dup
+      # Update the users
-      @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_billed)
+      #Employee.update_all
+  
+      # Check to see if there is a quickbooks user attached to the issue
+      @selected = context[:user].employee.id if context[:user].employee
+
+      # Generate the drop down list of quickbooks contacts
+      return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
     end
-    super
-  end
-  
-  # Add QBO options to the filter
-  def initialize_available_filters
-    add_available_filter "billed", :type => :boolean
-    super
   end
 
 end
-
-# Add module to TimeEntryQuery
-TimeEntryQuery.send(:prepend, QueryPatch)

lib/hooks/view_hook_listener.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,8 +8,12 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+module Hooks
+
   class ViewHookListener < Redmine::Hook::ViewListener
 
     render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
     
   end
+
+end

lib/hooks/view_layouts_hook_listener.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:
 #
@@ -8,22 +8,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 IssuesSaveHookListener < Redmine::Hook::ViewListener
+module Hooks
 
-  # Called Before Issue Saved
+  class ViewLayoutsHookListener < Redmine::Hook::ViewListener
-  def controller_issues_edit_before_save(context={})
+
-    issue = context[:issue]
+    # Load the javascript to support the autocomplete forms
-    issue.subject = issue.subject.titleize
+    def view_layouts_base_html_head(context = {})
-  end
+      js = javascript_include_tag 'application.js', :plugin => 'redmine_qbo'
+      js += javascript_include_tag 'autocomplete-rails.js', :plugin => 'redmine_qbo'
+      js += javascript_include_tag 'checkbox_controller.js', :plugin => 'redmine_qbo'
+      return js
+    end
 
-  # Called After Issue Saved
-  def controller_issues_edit_after_save(context={})
-    issue = context[:issue]
-    begin
-      issue.bill_time if issue.status.is_closed?
-    rescue
-      # TODO flash[:error] = "Unable to bill, check QBO Auth"
-    end
   end
 
 end

lib/issue_patch.rb

@@ -1,110 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2023 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
-    end
-    
-  end
-    
-  module ClassMethods
-    
-  end
-  
-  module InstanceMethods
-    
-    # Create billable time entries
-    def bill_time
-     
-      # Check to see if we have everything we need to bill the customer
-      return if assigned_to.nil?
-      return unless Qbo.first 
-      return unless customer 
-
-      # Get unbilled time entries
-      spent_time = time_entries.where(billed: [false, nil])
-      spent_hours ||= spent_time.sum(:hours) || 0
-      
-      if spent_hours > 0 then
-        
-        # Prepare to create a new Time Activity
-        qbo = Qbo.first
-        qbo.perform_authenticated_request do |access_token|
-          time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
-          item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
-          time_entry = Quickbooks::Model::TimeActivity.new
-  
-          # Lets total up each activity before billing.
-          # This will simpify the invoicing with a single billable time entry per time activity
-          h = Hash.new(0)
-          spent_time.each do |entry|
-            h[entry.activity.name] += entry.hours
-            # update time entries billed status
-            entry.billed = true
-            entry.save
-          end
-          
-          # Now letes upload our totals for each activity as their own billable time entry
-          h.each do |key, val|
-            
-            # Convert float spent time to hours and minutes
-            hours = val.to_i
-            minutesDecimal = (( val - hours) * 60)
-            minutes = minutesDecimal.to_i
-
-            # Lets match the activity to an qbo item
-            item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
-            next if item.nil?
-            
-            # Create the new billable time entry and upload it
-            time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
-            time_entry.employee_id = assigned_to.employee_id 
-            time_entry.customer_id = customer_id
-            time_entry.billable_status = "Billable"
-            time_entry.hours = hours
-            time_entry.minutes = minutes
-            time_entry.name_of = "Employee"
-            time_entry.txn_date = Date.today
-            time_entry.hourly_rate = item.unit_price
-            time_entry.item_id = item.id 
-            time_entry.start_time = start_date
-            time_entry.end_time = Time.now
-            time_service.create(time_entry)
-          end
-        end
-      end
-    end
-  end
-  
-  # Create a shareable link for a customer
-  def share_token
-    CustomerToken.get_token self
-  end
-  
-end  
-
-# Add module to Issue
-Issue.send(:include, IssuePatch)

lib/issues_form_hook_listener.rb

@@ -1,75 +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 IssuesFormHookListener < Redmine::Hook::ViewListener
-
-  # Load the javascript to support the autocomplete forms
-  def view_layouts_base_html_head(context = {})
-    js = javascript_include_tag 'application', :plugin => 'redmine_qbo'
-    js += javascript_include_tag 'autocomplete-rails', :plugin => 'redmine_qbo'
-    return js
-  end
-
-  # Edit Issue Form
-  # Here we build the required form components before passing them to a partial view formatting. 
-  def view_issues_form_details_bottom(context={})
-    f = context[:form]
-
-    # check project level customer ownership first
-    # This is done to preload customer information if the entire project is dedicated to a customer
-    if context[:project]
-      selected_customer = context[:project].customer ? context[:project].customer.id : nil
-    end
-
-    # Check to see if the issue already belongs to a customer
-    selected_customer = context[:issue].customer ? context[:issue].customer.id  : nil
-    selected_estimate = context[:issue].estimate ? context[:issue].estimate.id  : nil
-
-    # Load customer information
-    customer = Customer.find_by_id(selected_customer) if selected_customer
-
-    # Customer Name Text Box with database backed autocomplete
-    search_customer = f.autocomplete_field :customer,
-      autocomplete_customer_name_customers_path,
-      :selected => selected_customer,
-      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)",
-      :update_elements => { 
-        :id => '#issue_customer_id', 
-        :value => '#issue_customer' 
-      }
-
-    # Customer ID - Hidden Field
-    customer_id = f.hidden_field :customer_id,
-      :id => "issue_customer_id",
-      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
-
-    # Load estimates
-    if context[:issue].customer
-      estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
-    else
-      estimates = [nil].compact
-    end
-
-    # Generate the drop down list of quickbooks estimates
-    select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
-
-    # Pass all prebuilt form components to our partial
-    context[:controller].send(:render_to_string, {
-      :partial => 'issues/form_hook',
-        locals: {
-          search_customer: search_customer, 
-	        customer_id: customer_id, 
-	        context: context, 
-	        select_estimate: select_estimate,
-        } 
-      }
-    )
-  end
-end

lib/issues_show_hook_listener.rb

@@ -1,49 +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 IssuesShowHookListener < Redmine::Hook::ViewListener
-
-  # View Issue
-  # Display the quickbooks contact in the issue
-  def view_issues_show_details_bottom(context={})
-    issue = context[:issue]
-    
-    # Check to see if there is a quickbooks user attached to the issue
-    if issue.customer
-      customer = link_to issue.customer.name, customer_path( issue.customer.id )
-    end
-    
-    # Estimate Number
-    if issue.estimate
-      estimate = issue.estimate.doc_number
-      estimate_link = link_to estimate, estimate_path( issue.estimate.id ), :target => "_blank"
-    end
-    
-    # Invoice Number
-    invoice_link = ""
-    if issue.invoice_ids
-      issue.invoice_ids.each do |i|
-        invoice = Invoice.find i
-        invoice_link = invoice_link + link_to( invoice.doc_number, invoice_path( i ), :target => "_blank").to_s + " "
-	      invoice_link = invoice_link.html_safe
-      end
-    end
-
-    context[:controller].send(:render_to_string, {
-      :partial => 'issues/show_details',
-        locals: {
-          customer: customer, 
-	        estimate_link: estimate_link, 
-	        invoice_link: invoice_link
-        } 
-      })
-  end
-  
-end

lib/patches/attachments_controller_patch.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,13 @@
 
 require_dependency 'attachments_controller'
 
+module Patches
+
   module AttachmentsControllerPatch
 
     def self.included(base)
 
       base.class_eval do
-      unloadable # Send unloadable so it will not be unloaded in development
 
         # check if login is globally required to access the application
         def check_if_login_required
@@ -41,3 +42,5 @@ end
 
   # Add module to AttachmentsController
   AttachmentsController.send(:include, AttachmentsControllerPatch)
+
+end

lib/patches/issue_patch.rb

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

lib/patches/issues_controller_patch.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,6 +9,8 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 require_dependency 'issues_controller'
 
+module Patches
+
   module IssuesControllerPatch
 
     module Helper
@@ -23,7 +25,6 @@ module IssuesControllerPatch
     def self.included(base)
 
       base.class_eval do
-      unloadable # Send unloadable so it will not be unloaded in development
         helper Helper
       end
 
@@ -33,3 +34,5 @@ end
 
   # Add module to IssuessController
   IssuesController.send(:include, IssuesControllerPatch)
+
+end

lib/patches/pdf_patch.rb

@@ -0,0 +1,276 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_dependency 'redmine/export/pdf'
+require_dependency 'redmine/export/pdf/issues_pdf_helper'
+
+module Patches
+
+  module PdfPatch
+
+    def self.included(base)
+      base.send(:include, InstanceMethods)
+      base.class_eval do
+        alias_method :issue_to_pdf, :issue_to_pdf_with_patch
+        alias_method :issue_to_pdf_with_patch, :issue_to_pdf
+      end
+    end
+
+    module InstanceMethods
+
+      def issue_to_pdf_with_patch(issue, assoc={})
+        pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
+        pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}")
+        pdf.alias_nb_pages
+        pdf.footer_date = format_date(Date.today)
+        pdf.add_page
+        pdf.SetFontStyle('B',11)
+        buf = "#{issue.project} - #{issue.tracker} ##{issue.id}"
+        pdf.RDMMultiCell(190, 5, buf)
+        pdf.SetFontStyle('',8)
+        base_x = pdf.get_x
+        i = 1
+        issue.ancestors.visible.each do |ancestor|
+          pdf.set_x(base_x + i)
+          buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}"
+          pdf.RDMMultiCell(190 - i, 5, buf)
+          i += 1 if i < 35
+        end
+        pdf.SetFontStyle('B',11)
+        pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s)
+        pdf.SetFontStyle('',8)
+        pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
+        pdf.ln
+
+        customer = issue.customer.name if issue.customer
+        left = []
+        left << [l(:field_status), issue.status]
+        left << [l(:field_priority), issue.priority]
+        left << [l(:field_customer), customer]
+        left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
+        #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id')
+        #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
+        
+        logger.debug "Calling :pdf_left hook"
+        left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
+        unless left_hook_output.nil?
+          left_hook_output.each do |l|
+            left.concat l unless l.nil?
+          end
+        end
+
+        right = []
+        right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
+        right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date')
+        right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
+        right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
+        right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
+        
+        logger.debug "Calling :pdf_right hook"
+        right_hook_output = Redmine::Hook.call_hook :pdf_right, { issue: issue }
+        unless right_hook_output.nil?
+          right_hook_output.each do |r|
+            right.concat r unless r.nil?
+          end
+        end
+
+        rows = left.size > right.size ? left.size : right.size
+        while left.size < rows
+          left << nil
+        end
+        while right.size < rows
+          right << nil
+        end
+
+        half = (issue.visible_custom_field_values.size / 2.0).ceil
+        issue.visible_custom_field_values.each_with_index do |custom_value, i|
+          (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
+        end
+
+        if pdf.get_rtl
+          border_first_top = 'RT'
+          border_last_top = 'LT'
+          border_first = 'R'
+          border_last = 'L'
+        else
+          border_first_top = 'LT'
+          border_last_top = 'RT'
+          border_first = 'L'
+          border_last = 'R'
+        end
+
+        rows = left.size > right.size ? left.size : right.size
+        rows.times do |i|
+          heights = []
+          pdf.SetFontStyle('B',9)
+          item = left[i]
+          heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+          item = right[i]
+          heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+          pdf.SetFontStyle('',9)
+          item = left[i]
+          heights << pdf.get_string_height(60, item ? item.last.to_s : "")
+          item = right[i]
+          heights << pdf.get_string_height(60, item ? item.last.to_s : "")
+          height = heights.max
+
+          item = left[i]
+          pdf.SetFontStyle('B',9)
+          pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+          pdf.SetFontStyle('',9)
+          pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
+
+          item = right[i]
+          pdf.SetFontStyle('B',9)
+          pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+          pdf.SetFontStyle('',9)
+          pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
+
+          pdf.set_x(base_x)
+        end
+
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
+        pdf.SetFontStyle('',9)
+
+        # Set resize image scale
+        pdf.set_image_scale(1.6)
+        text = textilizable(issue, :description,
+                            :only_path => false,
+                            :edit_section_links => false,
+                            :headings => false,
+                            :inline_attachments => false
+        )
+        pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
+
+        unless issue.leaf?
+          truncate_length = (!is_cjk? ? 90 : 65)
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR")
+          pdf.ln
+          issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
+            buf = "#{child.tracker} # #{child.id}: #{child.subject}".
+                truncate(truncate_length)
+            level = 10 if level >= 10
+            pdf.SetFontStyle('',8)
+            pdf.RDMCell(35+135,5, (level >=1 ? "  " * level : "") + buf, border_first)
+            pdf.SetFontStyle('B',8)
+            pdf.RDMCell(20,5, child.status.to_s, border_last)
+            pdf.ln
+          end
+        end
+
+        relations = issue.relations.select { |r| r.other_issue(issue).visible? }
+        unless relations.empty?
+          truncate_length = (!is_cjk? ? 80 : 60)
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR")
+          pdf.ln
+          relations.each do |relation|
+            buf = relation.to_s(issue) {|other|
+              text = ""
+              if Setting.cross_project_issue_relations?
+                text += "#{relation.other_issue(issue).project} - "
+              end
+              text += "#{other.tracker} ##{other.id}: #{other.subject}"
+              text
+            }
+            buf = buf.truncate(truncate_length)
+            pdf.SetFontStyle('', 8)
+            pdf.RDMCell(35+155-60, 5, buf, border_first)
+            pdf.SetFontStyle('B',8)
+            pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "")
+            pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "")
+            pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last)
+            pdf.ln
+          end
+        end
+        pdf.RDMCell(190,5, "", "T")
+        pdf.ln
+
+        if issue.changesets.any? &&
+            User.current.allowed_to?(:view_changesets, issue.project)
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
+          pdf.ln
+          for changeset in issue.changesets
+            pdf.SetFontStyle('B',8)
+            csstr = "#{l(:label_revision)} #{changeset.format_identifier} - "
+            csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
+            pdf.RDMCell(190, 5, csstr)
+            pdf.ln
+            unless changeset.comments.blank?
+              pdf.SetFontStyle('',8)
+              pdf.RDMwriteHTMLCell(190,5,'','',
+                                  changeset.comments.to_s, issue.attachments, "")
+            end
+            pdf.ln
+          end
+        end
+
+        if assoc[:journals].present?
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(190,5, l(:label_history), "B")
+          pdf.ln
+          assoc[:journals].each do |journal|
+            pdf.SetFontStyle('B',8)
+            title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}"
+            title << " (#{l(:field_private_notes)})" if journal.private_notes?
+            pdf.RDMCell(190,5, title)
+            pdf.ln
+            pdf.SetFontStyle('I',8)
+            details_to_strings(journal.visible_details, true).each do |string|
+              pdf.RDMMultiCell(190,5, "- " + string)
+            end
+            if journal.notes?
+              pdf.ln unless journal.details.empty?
+              pdf.SetFontStyle('',8)
+              text = textilizable(journal, :notes,
+                                  :only_path => false,
+                                  :edit_section_links => false,
+                                  :headings => false,
+                                  :inline_attachments => false
+              )
+              pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
+            end
+            pdf.ln
+          end
+        end
+
+        if issue.attachments.any?
+          pdf.SetFontStyle('B',9)
+          pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
+          pdf.ln
+          for attachment in issue.attachments
+            pdf.SetFontStyle('',8)
+            pdf.RDMCell(80,5, attachment.filename)
+            pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+            pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
+            pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
+            pdf.ln
+          end
+        end
+
+        # Check to see if there is an estimate attached, then combine them
+        if issue.estimate
+          pdf = CombinePDF.parse(pdf.output, allow_optional_content: true)
+          pdf << CombinePDF.parse(issue.estimate.pdf)
+          return pdf.to_pdf
+        end
+
+        return pdf.output
+      end
+
+    end
+  end
+
+  Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)
+
+end

lib/patches/query_patch.rb

@@ -1,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,8 @@
 
 require_dependency 'issue_query'
 
+module Patches
+
   module QueryPatch
     
     # Add qbo options to the aviable columns
@@ -32,3 +34,5 @@ end
 
   # Add module to Issue
   IssueQuery.send(:prepend, QueryPatch)
+
+end

lib/patches/time_entry_query_patch.rb

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

lib/patches/user_patch.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,8 @@
 
 require_dependency 'user'
 
+module Patches
+
   # Patches Redmine's User dynamically.
   # Adds a relationships
   module UserPatch
@@ -20,7 +22,6 @@ module UserPatch
 
       # Same as typing in the class 
       base.class_eval do
-      unloadable # Send unloadable so it will not be unloaded in development
         belongs_to :employee, primary_key: :id
       end
     end
@@ -37,3 +38,5 @@ end
 
   # Add module to Issue
   User.send(:include, UserPatch)
+
+end

lib/pdf_patch.rb

@@ -1,256 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2023 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require_dependency 'redmine/export/pdf'
-require_dependency 'redmine/export/pdf/issues_pdf_helper'
-
-module PdfPatch
-
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-    base.class_eval do
-      unloadable # Send unloadable so it will not be unloaded in development
-      alias_method :issue_to_pdf, :issue_to_pdf_with_patch
-      alias_method :issue_to_pdf_with_patch, :issue_to_pdf
-      
-    end
-  end
-
-  module InstanceMethods
-
-    def issue_to_pdf_with_patch(issue, assoc={})
-      pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
-      pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}")
-      pdf.alias_nb_pages
-      pdf.footer_date = format_date(Date.today)
-      pdf.add_page
-      pdf.SetFontStyle('B',11)
-      buf = "#{issue.project} - #{issue.tracker} ##{issue.id}"
-      pdf.RDMMultiCell(190, 5, buf)
-      pdf.SetFontStyle('',8)
-      base_x = pdf.get_x
-      i = 1
-      issue.ancestors.visible.each do |ancestor|
-        pdf.set_x(base_x + i)
-        buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}"
-        pdf.RDMMultiCell(190 - i, 5, buf)
-        i += 1 if i < 35
-      end
-      pdf.SetFontStyle('B',11)
-      pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s)
-      pdf.SetFontStyle('',8)
-      pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
-      pdf.ln
-
-      customer = issue.customer.name if issue.customer
-      left = []
-      left << [l(:field_status), issue.status]
-      left << [l(:field_priority), issue.priority]
-      left << [l(:field_customer), customer]
-      left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
-   
-      logger.debug "Calling :pdf_left hook"
-      context = Redmine::Hook.call_hook :pdf_left, { array: left, issue: issue }
-      left = left + context.first unless context.nil?
-      
-      right = []
-      right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
-      right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date')
-      right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
-      right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
-      right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
-   
-      logger.debug "Calling :pdf_right hook"
-      context = Redmine::Hook.call_hook :pdf_right, { array: right, issue: issue }
-      right = right + context.first unless context.nil?
-
-      rows = left.size > right.size ? left.size : right.size
-      while left.size < rows
-        left << nil
-      end
-      while right.size < rows
-        right << nil
-      end
-
-      half = (issue.visible_custom_field_values.size / 2.0).ceil
-      issue.visible_custom_field_values.each_with_index do |custom_value, i|
-        (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
-      end
-
-      if pdf.get_rtl
-        border_first_top = 'RT'
-        border_last_top = 'LT'
-        border_first = 'R'
-        border_last = 'L'
-      else
-        border_first_top = 'LT'
-        border_last_top = 'RT'
-        border_first = 'L'
-        border_last = 'R'
-      end
-
-      rows = left.size > right.size ? left.size : right.size
-      rows.times do |i|
-        heights = []
-        pdf.SetFontStyle('B',9)
-        item = left[i]
-        heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
-        item = right[i]
-        heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
-        pdf.SetFontStyle('',9)
-        item = left[i]
-        heights << pdf.get_string_height(60, item ? item.last.to_s : "")
-        item = right[i]
-        heights << pdf.get_string_height(60, item ? item.last.to_s : "")
-        height = heights.max
-
-        item = left[i]
-        pdf.SetFontStyle('B',9)
-        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
-        pdf.SetFontStyle('',9)
-        pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
-
-        item = right[i]
-        pdf.SetFontStyle('B',9)
-        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
-        pdf.SetFontStyle('',9)
-        pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
-
-        pdf.set_x(base_x)
-      end
-
-      pdf.SetFontStyle('B',9)
-      pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
-      pdf.SetFontStyle('',9)
-
-      # Set resize image scale
-      pdf.set_image_scale(1.6)
-      text = textilizable(issue, :description,
-                          :only_path => false,
-                          :edit_section_links => false,
-                          :headings => false,
-                          :inline_attachments => false
-      )
-      pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
-
-      unless issue.leaf?
-        truncate_length = (!is_cjk? ? 90 : 65)
-        pdf.SetFontStyle('B',9)
-        pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR")
-        pdf.ln
-        issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
-          buf = "#{child.tracker} # #{child.id}: #{child.subject}".
-              truncate(truncate_length)
-          level = 10 if level >= 10
-          pdf.SetFontStyle('',8)
-          pdf.RDMCell(35+135,5, (level >=1 ? "  " * level : "") + buf, border_first)
-          pdf.SetFontStyle('B',8)
-          pdf.RDMCell(20,5, child.status.to_s, border_last)
-          pdf.ln
-        end
-      end
-
-      relations = issue.relations.select { |r| r.other_issue(issue).visible? }
-      unless relations.empty?
-        truncate_length = (!is_cjk? ? 80 : 60)
-        pdf.SetFontStyle('B',9)
-        pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR")
-        pdf.ln
-        relations.each do |relation|
-          buf = relation.to_s(issue) {|other|
-            text = ""
-            if Setting.cross_project_issue_relations?
-              text += "#{relation.other_issue(issue).project} - "
-            end
-            text += "#{other.tracker} ##{other.id}: #{other.subject}"
-            text
-          }
-          buf = buf.truncate(truncate_length)
-          pdf.SetFontStyle('', 8)
-          pdf.RDMCell(35+155-60, 5, buf, border_first)
-          pdf.SetFontStyle('B',8)
-          pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "")
-          pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "")
-          pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last)
-          pdf.ln
-        end
-      end
-      pdf.RDMCell(190,5, "", "T")
-      pdf.ln
-
-      if issue.changesets.any? &&
-          User.current.allowed_to?(:view_changesets, issue.project)
-        pdf.SetFontStyle('B',9)
-        pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
-        pdf.ln
-        for changeset in issue.changesets
-          pdf.SetFontStyle('B',8)
-          csstr = "#{l(:label_revision)} #{changeset.format_identifier} - "
-          csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
-          pdf.RDMCell(190, 5, csstr)
-          pdf.ln
-          unless changeset.comments.blank?
-            pdf.SetFontStyle('',8)
-            pdf.RDMwriteHTMLCell(190,5,'','',
-                                 changeset.comments.to_s, issue.attachments, "")
-          end
-          pdf.ln
-        end
-      end
-
-      if assoc[:journals].present?
-        pdf.SetFontStyle('B',9)
-        pdf.RDMCell(190,5, l(:label_history), "B")
-        pdf.ln
-        assoc[:journals].each do |journal|
-          pdf.SetFontStyle('B',8)
-          title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}"
-          title << " (#{l(:field_private_notes)})" if journal.private_notes?
-          pdf.RDMCell(190,5, title)
-          pdf.ln
-          pdf.SetFontStyle('I',8)
-          details_to_strings(journal.visible_details, true).each do |string|
-            pdf.RDMMultiCell(190,5, "- " + string)
-          end
-          if journal.notes?
-            pdf.ln unless journal.details.empty?
-            pdf.SetFontStyle('',8)
-            text = textilizable(journal, :notes,
-                                :only_path => false,
-                                :edit_section_links => false,
-                                :headings => false,
-                                :inline_attachments => false
-            )
-            pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
-          end
-          pdf.ln
-        end
-      end
-
-      if issue.attachments.any?
-        pdf.SetFontStyle('B',9)
-        pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
-        pdf.ln
-        for attachment in issue.attachments
-          pdf.SetFontStyle('',8)
-          pdf.RDMCell(80,5, attachment.filename)
-          pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
-          pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
-          pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
-          pdf.ln
-        end
-      end
-      pdf.output
-    end
-
-  end
-end
-
-Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)

lib/projects_form_hook_listener.rb

@@ -1,27 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2017 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 ProjectsFormHookListener < Redmine::Hook::ViewListener
-  
-  # Edit Project Form
-  def view_projects_form(context={})
-    f = context[:form]
- 
-    # Check to see if there is a quickbooks user attached to the issue
-    selected_customer = context[:project].customer ? context[:project].customer : nil
-    
-    # Load customer information
-    customer = Customer.find_by_id(selected_customer) if selected_customer
-    search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#project_customer_id', :value => '#project_customer'}
-    customer_id = f.hidden_field :customer_id, :id => "project_customer_id"
-    
-    return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p>"
-  end
-end

lib/users_show_hook_listener.rb

@@ -1,25 +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 UsersShowHookListener < Redmine::Hook::ViewListener
-
-  # View User
-  def view_users_form(context={})
-    
-    # Update the users
-    #Employee.update_all
- 
-    # Check to see if there is a quickbooks user attached to the issue
-    @selected = context[:user].employee.id if context[:user].employee
-
-    # Generate the drop down list of quickbooks contacts
-    return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
-  end
-end

test/functional/qbo_controller_test.rb

@@ -1,6 +1,6 @@
 #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:
 #

test/unit/qbo_customers_test.rb

@@ -1,6 +1,6 @@
 #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:
 #

test/unit/qbo_test.rb

@@ -1,6 +1,6 @@
 #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:
 #