Finaly got the issue form javascrip reloading to work

This fixes the bug where documents were displayed out of order

Gemfile

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2024 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,81 +1,110 @@
-# Redmine Quickbooks Online
+# Redmine QuickBooks Online
 
-A plugin for Redmine to connect to Quickbooks Online
+A plugin for Redmine to connect to QuickBooks Online.
 
-The goal of this project is to allow Redmine to connect with Quickbooks Online to create Time Activity Entries for billable hours loged when an Issue is closed.
+The goal of this project is to allow Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed.
 
-#### Disclaimer
+## Disclaimer
 
-Note: Although the core functionality is complete, this project is still under development & the master branch may be unstable. Tags should be stable and are recommended
+**Note:** Although the core functionality is complete, this project is still under development and the master branch may be unstable. Tags should be stable and are recommended.
 
-Use tags 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
+    
-  * Seperate Vehicles into a seperate plugin (I use redmine for my automotive shop management 😉)
+*   Separate Vehicles into a separate plugin (I use Redmine for my automotive shop management 😉)
-  * MORE Stuff as I make it up...
+    
+*   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) 2024 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

app/controllers/estimate_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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,12 +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
+    # Force sync for estimate by doc number if not found
-    begin
+    if  Estimate.find_by_doc_number(params[:search]).nil?
-      Estimate.sync_by_doc_number(params[:search]) if params[:search]
+      begin
-    rescue
+        Estimate.sync_by_doc_number(params[:search]) if params[:search]
-      logger.info "Estimate.find_by_doc_number failed"
+      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) 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)
-        invoice = service.fetch_by_id(params[:id])
+        
-        @pdf = service.pdf(invoice)
+        # If multiple id's then pull each pdf & combine them
-        send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+        if params[:invoice_ids]
+          logger.info("Grabbing pdfs for " + params[:invoice_ids].join(', '))
+          ref = ""
+          params[:invoice_ids].each do |i|
+            logger.info("processing " + i)
+            invoice = service.fetch_by_id(i)
+            ref += " #{invoice.doc_number}"
+            @pdf << CombinePDF.parse(service.pdf(invoice)) unless @pdf.nil?
+            if @pdf.nil?
+              @pdf = CombinePDF.parse(service.pdf(invoice))
+            end
+          end
+          @pdf = @pdf.to_pdf
+        else
+          invoice = service.fetch_by_id(params[:id])
+          @pdf = service.pdf(invoice)
+          ref = invoice.doc_number
+        end
+
+        send_data @pdf, filename: "invoice #{ref}.pdf", :disposition => 'inline', :type => "application/pdf"
       end
     rescue
       redirect_to :back, :flash => { :error => "Invoice not found" }

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2016 - 2025 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,8 +25,8 @@ class QboController < ApplicationController
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
-    redirect_uri = "https://" + Setting.host_name + qbo_oauth_callback_path
+    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
-    logger.info "redirect_uri: " + redirect_uri
+    logger.info "redirect_uri: #{redirect_uri}"
     oauth2_client = Qbo.construct_oauth2_client
     grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
     redirect_to grant_url
@@ -40,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 = "https://" + Setting.host_name + qbo_oauth_callback_path
+      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
@@ -52,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
@@ -66,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
   
@@ -85,44 +84,46 @@ class QboController < ApplicationController
     
     # proceed if the request is good
     if hash.eql? signature
-      if request.headers['content-type'] == 'application/json'
+      Thread.new do
-        data = JSON.parse(data)
+        if request.headers['content-type'] == 'application/json'
-      else
+          data = JSON.parse(data)
-        # application/x-www-form-urlencoded
-        data = params.as_json
-      end
-      # Process the information
-      entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
-      entities.each do |entity|
-        id = entity['id'].to_i
-        name = entity['name']
-       
-        logger.info "Casting #{name.constantize} to obj"
-
-        # Magicly initialize the correct class
-        obj = name.constantize
-
-        # for merge events
-        obj.destroy(entity['deletedId']) if entity['deletedId']
-        
-        #Check to see if we are deleting a record
-        if entity['operation'].eql? "Delete"
-            obj.destroy(id)
-        #if not then update!
         else
-          begin
+          # application/x-www-form-urlencoded
-            obj.sync_by_id(id)
+          data = params.as_json
-          rescue => e
+        end
-            logger.error "Failed to call sync_by_id on obj"
+        # Process the information
-            logger.error e.message
+        entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
-            logger.error e.backtrace.join("\n")
+        entities.each do |entity|
+          id = entity['id'].to_i
+          name = entity['name']
+        
+          logger.info "Casting #{name.constantize} to obj"
+
+          # Magicly initialize the correct class
+          obj = name.constantize
+
+          # for merge events
+          obj.destroy(entity['deletedId']) if entity['deletedId']
+          
+          #Check to see if we are deleting a record
+          if entity['operation'].eql? "Delete"
+            obj.destroy(id)
+          #if not then update!
+          else
+            begin
+              obj.sync_by_id(id)
+            rescue => e
+              logger.error "Failed to call sync_by_id on obj"
+              logger.error e.message
+              logger.error e.backtrace.join("\n")
+            end
           end
         end
+        
+        # Record that last time we updated
+        Qbo.update_time_stamp
+        ActiveRecord::Base.connection.close
       end
-      
-      # Record that last time we updated
-      Qbo.update_time_stamp
-      
       # The webhook doesn't require a response but let's make sure we don't send anything
       render :nothing => true, status: 200
     else
@@ -151,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/controllers/vehicles_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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 VehiclesController < ApplicationController
-  unloadable
 
   include AuthHelper
 

app/models/concerns/quickbooks_oauth.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2016 - 2025 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 - 2025 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
   has_many :vehicles

app/models/customer_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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) 2024 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) 2024 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 

app/models/invoice.rb

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

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2016 - 2025 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/models/vehicle.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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,8 +10,6 @@
 
 class Vehicle < ActiveRecord::Base
   
-  unloadable
-  
   belongs_to :customer
   has_many :issues, :foreign_key => 'vehicles_id'
   

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

@@ -38,12 +38,20 @@
     
     <tr>
       <th><%=t(:field_notes)%></th>
-      <td><%= customer.notes %></td>
+      <td>
+       <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

@@ -7,7 +7,22 @@
 
         <h4><%=t(:label_details)%>:</h4>
 
-        <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+        <!-- Customer Info -->
+
+        <div class="splitcontent">
+          <div class="splitcontentleft">
+            <h4><%=t(:label_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">

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,9 +1,22 @@
 <% if @customer.present? %>
 
-  <% @customer.invoices.order(doc_number: :desc).each do |invoice| %>
+  <%= form_with(url: invoice_path, method: :get) do |form| %>
-    <div class="row">
+
-      <b><%= link_to "##{invoice.doc_number}", invoice_path(invoice), target: :_blank %></b> <%= invoice.txn_date %>
+    <div class="form-check">
+      <%= check_box_tag "select-all-invoices", "1", false, id: "select-all-invoices" %>
+      <%= label_tag "select-all-invoices", "Select All Invioces" %>
     </div>
+
+    <hr>
+
+    <% @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 %>
+
+    <%= form.submit "Bulk PDF" %>
   <% end %>
 
 <% else %>

app/views/issues/_form_hook.html.erb

@@ -2,7 +2,7 @@
     <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)") %>
+    <%= link_to t(:label_load_customer), '#', onclick: "#{js_link}; return false;" %>
 </p> 
 
 <p>

app/views/issues/_show_details.html.erb

@@ -29,7 +29,11 @@
        
     <div class="vehicle_notes attribute">
       <div class="label"><span><%=t(:field_notes)%></span>:</div>
-      <div class="value"><%=notes%></div>
+      <div class="value">
+        <pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; ">
+          <%=notes%>
+        </pre>
+      </div>
     </div>
   </div>
 </div>

app/views/qbo/_settings.html.erb

@@ -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/vehicles/_details.html.erb

@@ -32,9 +32,17 @@
     <div class="splitcontentleft">
 
       <h4><%=t(:field_notes)%>:</h4>
-        <td><%= vehicle.notes %></td>
+        <pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; ">
+          <td><%= vehicle.notes %></td>
+        </pre>
       </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>
+
     </div>
   </div>
 </div>

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

@@ -89,4 +89,8 @@ en:
   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"

db/migrate/032_add_txn_dates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2024 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,41 +9,46 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class AddTxnDates < ActiveRecord::Migration[5.1]
+
   def change
-    add_column :qbo_invoices, :txn_date, :date
+    begin
-    add_column :qbo_estimates, :txn_date, :date
+      add_column :qbo_invoices, :txn_date, :date
+      add_column :qbo_estimates, :txn_date, :date
 
-    reversible do |direction|
+      reversible do |direction|
-      direction.up {
+        direction.up {
-        break unless Qbo.first
+          break unless Qbo.first
 
-        QboEstimate.reset_column_information
+          QboEstimate.reset_column_information
-        QboInvoice.reset_column_information
+          QboInvoice.reset_column_information
 
-        say "Sync Estimates"
+          say "Sync Estimates"
 
-        QboEstimate.sync
+          QboEstimate.sync
 
-        say "Sync Invoices"
+          say "Sync Invoices"
 
-        qbo = Qbo.first
+          qbo = Qbo.first
-        invoices = qbo.perform_authenticated_request do |access_token|
+          invoices = qbo.perform_authenticated_request do |access_token|
-          service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+            service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-          service.all
+            service.all
-        end
+          end
 
-        return unless invoices
+          return unless invoices
 
-        invoices.each { |invoice|
+          invoices.each { |invoice|
-            # Load the invoice into the database
+              # Load the invoice into the database
-            qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+              qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
-            qbo_invoice.doc_number = invoice.doc_number
+              qbo_invoice.doc_number = invoice.doc_number
-            qbo_invoice.id = invoice.id
+              qbo_invoice.id = invoice.id
-            qbo_invoice.customer_id = invoice.customer_ref
+              qbo_invoice.customer_id = invoice.customer_ref
-            qbo_invoice.txn_date = invoice.txn_date
+              qbo_invoice.txn_date = invoice.txn_date
-            qbo_invoice.save!
+              qbo_invoice.save!
+          }
         }
-      }
+      end
+    rescue
+      logger.error "AddTxnDates Failed"
     end
   end
 

db/migrate/033_update_vehicles_trim.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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,19 +10,22 @@
 
 class UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
   def change
-    add_column :vehicles, :doors, :text
+    begin
-    add_column :vehicles, :trim, :text
+      add_column :vehicles, :doors, :text
+      add_column :vehicles, :trim, :text
 
-    reversible do |direction|
+      reversible do |direction|
-      direction.up {
+        direction.up {
-
-        # Update local vehicle database by forcing a save, look at before_save
-        vehicles = Vehicle.all
-        vehicles.each { |vehicle|
-            vehicle.save!
-        }
 
+          # Update local vehicle database by forcing a save, look at before_save
+          vehicles = Vehicle.all
+          vehicles.each { |vehicle|
+              vehicle.save!
+          }
       }
+      end
+    rescue
+      logger.error "Failed to update vehicles"
     end
 
   end

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'
   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.1.1'
+  version '2026.1.0'
   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'
@@ -39,9 +31,6 @@ Redmine::Plugin.register :redmine_qbo do
   Project.safe_attributes 'customer_id'
   Project.safe_attributes 'vehicle_id'
 
-  # We are playing in the sandbox 
-  #Quickbooks.sandbox_mode = true
-
   # set per_page globally
   WillPaginate.per_page = 20
 
@@ -55,3 +44,9 @@ Redmine::Plugin.register :redmine_qbo do
   menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
     
 end
+
+# Dynamically load all Hooks & Patches
+Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file|
+  next unless file.end_with?('.rb')
+  require_relative "lib/#{file.delete_suffix(".rb") }"
+end

lib/attachments_controller_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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,6 @@ 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

lib/header_footer_hook_listener.rb

@@ -8,11 +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 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

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2024 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:
 #
@@ -21,7 +21,6 @@ module IssuePatch
 
     # 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

lib/issues_controller_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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:
 #
@@ -23,7 +23,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
 

lib/issues_form_hook_listener.rb

@@ -10,17 +10,11 @@
 
 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]
+    issue = context[:issue]
 
     # check project level customer ownership first
     # This is done to preload customer information if the entire project is dedicated to a customer
@@ -30,9 +24,12 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     end
 
     # Check to see if the issue already belongs to a customer
-    selected_customer = context[:issue].customer ? context[:issue].customer.id  : nil
+    selected_customer = issue.customer ? issue.customer.id  : nil
-    selected_estimate = context[:issue].estimate ? context[:issue].estimate.id  : nil
+    selected_estimate = issue.estimate ? issue.estimate.id  : nil
-    selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
+    selected_vehicle = issue.vehicles_id ? issue.vehicles_id : nil
+
+    # Gernerate edit.js link
+    js_link = issue.new_record? ? "updateIssueFrom('/projects/rmt/issues/new.js', this)" : "updateIssueFrom('/issues/#{issue.id}/edit.js', this)"
 
     # Load customer information
     customer = Customer.find_by_id(selected_customer) if selected_customer
@@ -41,7 +38,7 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     search_customer = f.autocomplete_field :customer,
       autocomplete_customer_name_customers_path,
       :selected => selected_customer,
-      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)",
+      :onchange => js_link,
       :update_elements => { 
         :id => '#issue_customer_id', 
         :value => '#issue_customer' 
@@ -50,10 +47,10 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     # Customer ID - Hidden Field
     customer_id = f.hidden_field :customer_id,
       :id => "issue_customer_id",
-      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
+      :onchange => js_link
 
     # Load estimates & vehicles
-    if context[:issue].customer
+    if issue.customer
       if customer.vehicles
         vehicles = customer.vehicles.pluck(:name, :id)
       else
@@ -75,7 +72,7 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
         locals: {
           search_customer: search_customer, 
 	        customer_id: customer_id, 
-	        context: context, 
+	        js_link: js_link, 
 	        select_estimate: select_estimate,
 	        vehicle: vehicle
         } 

lib/pdf_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2023 rick barrette
+#Copyright (c) 2024 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:
 #
@@ -16,10 +16,8 @@ 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
 

lib/project_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2024 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:
 #
@@ -21,7 +21,6 @@ module ProjectPatch
 
   # 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 :vehicle, primary_key: :id
   end

lib/user_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2024 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:
 #
@@ -20,7 +20,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

lib/view_layouts_hook_listener.rb

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