2026.1.3

Use the QBO sandbox & Display DEVEOMPENT in the plugin name

.gitignore

@@ -1,3 +1,5 @@
 .bundle
 .config
+.dockerrc
+.vscode
 Gemfile.lock

Gemfile

@@ -1,8 +1,14 @@
 source 'https://rubygems.org'
 
-gem 'quickbooks-ruby', :git => 'https://github.com/rickbarrette/quickbooks-ruby.git'
-gem 'quickbooks-ruby-base'
-gem 'oauth-plugin'#, '~> 0.5.1'
-gem 'oauth'
+gem 'quickbooks-ruby'
+gem 'oauth2'
 gem 'roxml'
-gem 'nokogiri'
+gem 'will_paginate'
+gem 'rails-jquery-autocomplete'
+gem 'jquery-ui-rails'
+gem 'rexml'
+gem 'combine_pdf'
+
+group :assets do
+  gem 'coffee-rails'
+end

LICENSE

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

README.md

@@ -1,71 +1,109 @@
-#Redmine Quickbooks Online
+# Redmine QuickBooks Online
 
-A simple 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 completed work 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.
 
-`Note: This project is under heavy development. Currently the initial functionality goal has been meet, however I am still working on adding other features. Tags should be stable`
+## Disclaimer
 
-####How it works
-* Issues can be assigned to a QBO Customer and QBO Service Item via drop down in issues form
-  - The `QBO Employee` for the issue is assigned via the assigned redmine user
-  - IF an `Issue` has been assined a `QBO Customer`, `QBO Service Item` & `QBO Employee` when an `Issue` is closed the following will happen:
-  - A new `QBO Time Activity` agaist the `QBO Customer` will be created using the total spent hours logged agaist an `Issue`.
-  - The rate will be the set via the `QBO Service Item` price
-* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `QBO Service Item` cost.
-  - Needs to have a `QBO Customer` & `QBO Service Item` Assiged
-* Users will be assigned a `QBO Employee` via a drop down in the user admistration page.
+**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.
 
-##Prerequisites
+## Compatibility
 
-* Sign up to become a developer for Intuit https://developer.intuit.com/
-* Create your own aplication to obtain your API keys
+| Plugin Version | Redmine Version |
+| :--- | :--- |
+| Version 2026.1.0+ | Redmine 6.1 |
+| Version 2.0.0+ | Redmine 5 |
+| Version 1.0.0+ | Redmine 4 |
+| Version 0.8.1 | Redmine 3 |
 
-##The Install
+## Features
 
-1. To install, clone this repo into your plugin folder
+* **Customer Assignment:** Issues can be assigned to a Customer via a dropdown in the edit Issue form.
+    * Once a customer is attached to an Issue, you can attach an Estimate to the issue via a dropdown menu.
+* **Employee Mapping:** An Employee is assigned to a Redmine User via a dropdown in the User Administration page.
+* **Automatic Billing:** If an Issue has been assigned a Customer, the following happens when the Issue is closed:
+    * A new Time Activity will be billed against the Customer assigned to the issue for each Redmine Time Entry.
+    * Time Entries will be totalled up by Activity name. This allows billing for different activities without having to create separate Issues.
+    * The Time Activity names are used to dynamically lookup Items in QuickBooks.
+    * If there are no Items that match the Activity name, it will be skipped and will not be billed to the Customer.
+    * Labor Rates are set by the corresponding Item in QuickBooks.
+* **Customer Management:** Customers can be created via the New Customer Page.
+    * Customers can be searched by name or phone number.
+    * Basic information for the Customer can be viewed/edited via the Customer page.
+* **Webhook Support:**
+    * **Invoices:** Automatically attached to an Issue if a line item contains a hashtag number (e.g., `#123`).
+    * **Custom Fields:** Invoice Custom Fields are matched to Issue Custom Fields and are automatically updated in QuickBooks. (Useful for extracting Mileage In/Out from the Issue to update the Invoice).
+    * **Sync:** Customers are automatically updated in the local database.
 
-  `git clone git@github.com:rickbarrette/redmine_qbo.git` 
+## Prerequisites
 
-2. Migrate your database
+* Sign up to become a developer for Intuit: https://developer.intuit.com/
+* Create your own application to obtain your API keys.
+* Set up the webhook service to `https://redmine.yourdomain.com/qbo/webhook`
 
-  `rake redmine:plugins:migrate RAILS_ENV=production`
+## Installation
 
-3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
+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>
+   ```
 
-  ![Alt plugin_config](/Screenshots/plugin_config.png)
+2.  **Install dependencies:** *Crucial for Redmine 6 / Rails 7 compatibility.*
     
-4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
+    Bash
     
-5. Assign an Employee to each of your users via the User Administration Page
+    ```
+    bundle install
+    ```
+    
+3.  **Migrate your database:**
+    
+    Bash
+    
+    ```
+    bundle exec rake redmine:plugins:migrate RAILS_ENV=production
+    ```
+    
+4.  **Restart Redmine:** You must restart your Redmine server instance for the plugin and hooks to load.
+    
+5.  **Configuration:**
+    
+    *   Navigate to the plugin configuration page (`Administration > Plugins > Configure`).
+        
+    *   Supply your own OAuth Key & Secret.
+        
+    *   After saving the Key & Secret, click the **Authenticate** link on the configuration page to connect to QBO.
+        
+6.  **User Mapping:**
+    
+    *   Assign an Employee to each of your users via the **User Administration Page**.
         
-  ![Alt plugin_user_edit](/Screenshots/plugin_user_edit.png)
 
 ## Usage
 
-  To enable automatic `QBO Time Activity` entries for an `Issue` , you need only to assign a `QBO Customer` and `QBO Item` to an `Issue` via drop downs in the 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.
 
-  ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
-
-Note: Customers, Employees, and Service Items with automaticly update during normal usage of redmine i.e. a page refresh. You can also manualy force redmine to sync its database with QBO clicking the sync link in the Quickbooks top menu page 
-
-  ![Alt plugin_top_menu](/Screenshots/plugin_top_menu.png)
+**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.
 
 ## TODO
-  * Abiltiy to add line items to a ticket in a dynamic table so they can be added to the invoice upon closing of the issue
-  * Add a rake file to create required Trackers or statuses required
-  * Add link Invoice PDF to issue after creation.
-  * Clean up view hook code, possibly use a controller hook and reder partial views
-  * Add Setting for Sandbox Mode
 
-##License
+*   Add hooks to intergrate other plugins, i.e. customer vehicles for example
+*   MORE Stuff as I make it up...
     
-The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+## License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+> The MIT License (MIT)
+>
+> Copyright (c) 2016 - 2026 Rick Barrette
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

app/controllers/customers_controller.rb

@@ -0,0 +1,224 @@
+#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.
+
+# This controller class will handle map management
+class CustomersController < ApplicationController
+
+  include AuthHelper
+  helper :issues
+  helper :journals
+  helper :projects
+  helper :custom_fields
+  helper :issue_relations
+  helper :watchers
+  helper :attachments
+  helper :queries
+  include QueriesHelper
+  helper :repositories
+  helper :sort
+  include SortHelper
+  helper :timelog
+
+  before_action :add_customer, :only => :new
+  before_action :view_customer, :except => [:new, :view]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
+
+  default_search_scope :names
+
+  autocomplete :customer, :name, :full => true, :extra_data => [:id]
+
+  def allowed_params
+    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
+  end
+
+  # getter method for a customer's invoices
+  # used for customer autocomplete field / issue form
+  def filter_invoices_by_customer
+    @filtered_invoices = Invoice.all.where(customer_id: params[:selected_customer])
+  end
+
+  # getter method for a customer's estimates
+  # used for customer autocomplete field / issue form
+  def filter_estimates_by_customer
+    @filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
+  end
+
+  # display a list of all customers
+  def index
+    if params[:search]
+      @customers = Customer.search(params[:search]).paginate(:page => params[:page])
+      if only_one_non_zero?(@customers)
+        redirect_to @customers.first
+      end
+    end
+  end
+
+  # initialize a new customer
+  def new
+    @customer = Customer.new
+  end
+
+  # create a new customer
+  def create
+    @customer = Customer.new(allowed_params)
+    if @customer.save
+      flash[:notice] = "New Customer Created"
+      redirect_to @customer
+    else
+      flash[:error] = @customer.errors.full_messages.to_sentence
+      redirect_to new_customer_path
+    end
+  end
+
+  # display a specific customer
+  def show
+    begin
+      @customer = Customer.find_by_id(params[:id])
+      @issues = @customer.issues.order(id: :desc)
+      @billing_address = address_to_s(@customer.billing_address)
+      @shipping_address = address_to_s(@customer.shipping_address)
+      @closed_issues = (@issues - @issues.open)
+      @hours = 0
+      @closed_hours = 0
+      @issues.open.each { |i| @hours+= i.total_spent_hours }
+      @closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
+    rescue 
+      render_404
+    end
+  end
+
+  # return an HTML form for editing a customer
+  def edit
+    begin
+      @customer = Customer.find_by_id(params[:id])
+    rescue 
+      render_404
+    end
+  end
+
+  # update a specific customer
+  def update
+    begin
+      @customer = Customer.find_by_id(params[:id])
+      if @customer.update(allowed_params)
+        flash[:notice] = "Customer updated"
+        redirect_to @customer
+      else
+        redirect_to edit_customer_path
+        flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
+      end
+    rescue 
+      render_404
+    end
+  end
+
+  # delete a customer
+  def destroy
+    begin
+      Customer.find_by_id(params[:id]).destroy
+      flash[:notice] = "Customer deleted successfully"
+      redirect_to action: :index
+    rescue 
+      render_404
+    end
+  end
+
+  # creates new customer view tokens, removes expired tokens & redirects to newly created customer view with new token.
+  def share
+
+    Thread.new do
+      logger.info "Removing expired customer tokens"
+      CustomerToken.remove_expired_tokens
+      ActiveRecord::Base.connection.close
+    end
+
+    begin
+      issue = Issue.find_by_id(params[:id])
+      redirect_to view_path issue.share_token.token
+    rescue
+      render_404
+    end
+  end
+  
+  # displays an issue for a customer with a provided security CustomerToken
+  def view
+
+    User.current = User.find_by lastname: 'Anonymous'
+
+    @token = CustomerToken.find_by token: params[:token]
+    begin
+      @token.destroy if @token.expired?
+      raise "Token Expired" if @token.destroyed
+      
+      session[:token] = @token.token
+      @issue = Issue.find @token.issue_id
+      @journals = @issue.journals.
+        preload(:details).
+        preload(:user => :email_address).
+        reorder(:created_on, :id).to_a
+      @journals.each_with_index {|j,i| j.indice = i+1}
+      @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+      Journal.preload_journals_details_custom_fields(@journals)
+      @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
+      @journals.reverse! if User.current.wants_comments_in_reverse_order?
+
+      @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
+      @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+
+      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+      @priorities = IssuePriority.active
+      @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+      @relation = IssueRelation.new
+    rescue
+      render_403
+    end
+  end
+
+  private
+
+  # redmine permission - add customers
+  def add_customer
+    global_check_permission(:add_customers)
+  end
+
+  # redmine permission - view customers
+  def view_customer
+    global_check_permission(:view_customers)
+  end
+
+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      if val!=0
+        return false if found_non_zero
+        found_non_zero = true
+      end
+    end
+    found_non_zero
+  end
+
+  # format a quickbooks address to a human readable string
+  def address_to_s (address)
+    return if address.nil?
+    string = address.line1 if address.line1
+    string << "\n" + address.line2 if address.line2
+    string << "\n" + address.line3 if address.line3
+    string << "\n" + address.line4 if address.line4
+    string << "\n" + address.line5 if address.line5
+    string << " " + address.city if address.city
+    string << ", " + address.country_sub_division_code if address.country_sub_division_code
+    string << " " + address.postal_code if address.postal_code
+    return string
+  end
+
+end

app/controllers/estimate_controller.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:
 #
@@ -8,15 +8,51 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class EstimateController < ApplicationController
-  unloadable
+  
+  include AuthHelper
+  
+  before_action :require_user, :unless => proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+
+  def get_estimate
+    # Force sync for estimate by doc number if not found
+    if  Estimate.find_by_doc_number(params[:search]).nil?
+      begin
+        Estimate.sync_by_doc_number(params[:search]) if params[:search]
+      rescue
+        logger.info "Estimate.find_by_doc_number failed"
+      end
+    end
+
+    estimate = Estimate.find_by_id(params[:id]) if params[:id]
+    estimate = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    return estimate
+  end
   
   #
   # Downloads and forwards the estimate pdf
   #
   def show
-    base = QboEstimate.get_base.service
-    @pdf = base.pdf(base.fetch_by_id(params[:id]))
-    send_data @pdf, filename: "estimate.pdf", :disposition => 'inline', :type => "application/pdf"
+    estimate = get_estimate
+
+    begin
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
+  end
+
+  #
+  # Downloads estimate by document number
+  #
+  def doc
+    estimate = get_estimate
+    
+    begin
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
   end
 
 end

app/controllers/invoice_controller.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:
 #
@@ -8,14 +8,47 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class InvoiceController < ApplicationController
-  unloadable
+  
+  include AuthHelper
+  require 'combine_pdf'
+
+  before_action :require_user, :unless => proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
   
   #
   # Downloads and forwards the invoice pdf
   #
   def show
-    base = QboInvoice.get_base.service
-    @pdf = base.pdf(base.fetch_by_id(params[:id]))
-    send_data @pdf, filename: "invoice.pdf", :disposition => 'inline', :type => "application/pdf"
+    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)
+          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" }
+    end
   end
 end

app/controllers/qbo_controller.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:
 #
@@ -9,70 +9,149 @@
 #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
   
-  #
-  # Called when the QBO Top Menu us shown
-  #
-  def index
-    @qbo = Qbo.first
-    @qbo_customer_count = QboCustomer.count
-    @qbo_item_count = QboItem.count
-    @qbo_employee_count = QboEmployee.count
-    @qbo_invoice_count = QboInvoice.count
-    @qbo_estimate_count = QboEstimate.count
+  require 'openssl'
+  
+  include AuthHelper
+  
+  before_action :require_user, :except => :webhook
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
+
+  def allowed_params
+    params.permit(:code, :state, :realmId, :id)
   end
 
   #
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
-    callback = request.base_url + qbo_oauth_callback_path
-    token = Qbo.get_oauth_consumer.get_request_token(:oauth_callback => callback)
-    session[:qb_request_token] = token
-    redirect_to("https://appcenter.intuit.com/Connect/Begin?oauth_token=#{token.token}") and return
+    redirect_uri = "#{Setting.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
+    logger.info "redirect_uri: #{redirect_uri}"
+    oauth2_client = Qbo.construct_oauth2_client
+    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: redirect_uri, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
+    redirect_to grant_url
   end
   
   #
   # Called by QBO after authentication has been processed
   #
   def oauth_callback
-    at = session[:qb_request_token].get_access_token(:oauth_verifier => params[:oauth_verifier])
-    token = at.token
-    secret = at.secret
-    realm_id = params['realmId']
+    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.protocol}://#{Setting.host_name + qbo_oauth_callback_path}"
+      if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
         
-    #There can only be one...
-    Qbo.destroy_all
+        # Remove the last authentication information
+        Qbo.delete_all
         
         # Save the authentication information 
         qbo = Qbo.new
-    qbo.token = token
-    qbo.secret = secret
-    qbo.token_expires_at = 6.months.from_now.utc
-    qbo.reconnect_token_at = 5.months.from_now.utc
-    qbo.realmId = realm_id
+        qbo.update(oauth2_access_token: resp.token, oauth2_refresh_token: resp.refresh_token, realm_id: params[:realmId])
+        qbo.refresh_token!
+        
         if qbo.save!
-      redirect_to 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
+    end
+  end
+  
+  # Manual Billing
+  def bill
+    i = Issue.find_by_id params[:id]
+    if i.customer
+      i.bill_time
+      redirect_to i, :flash => { :notice => I18n.t(:label_billed_success) + i.customer.name }
+    else
+      redirect_to i, :flash => { :error => I18n.t(:label_billing_error) }
+    end
+  end
+  
+  # Quickbooks Webhook Callback
+  def webhook
+
+    logger.info "Quickbooks is calling webhook"
+    
+    # check the payload
+    signature = request.headers['intuit-signature']
+    key = Setting.plugin_redmine_qbo['settingsWebhookToken']
+    data = request.body.read
+    hash = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, data)).strip()
+    
+    # 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
+          # application/x-www-form-urlencoded
+          data = params.as_json
+        end
+        # Process the information
+        entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
+        entities.each do |entity|
+          id = entity['id'].to_i
+          name = entity['name']
+        
+          logger.info "Casting #{name.constantize} to obj"
+
+          # Magicly initialize the correct class
+          obj = name.constantize
+
+          # for merge events
+          obj.destroy(entity['deletedId']) if entity['deletedId']
+          
+          #Check to see if we are deleting a record
+          if entity['operation'].eql? "Delete"
+            obj.destroy(id)
+          #if not then update!
+          else
+            begin
+              obj.sync_by_id(id)
+            rescue => e
+              logger.error "Failed to call sync_by_id on obj"
+              logger.error e.message
+              logger.error e.backtrace.join("\n")
+            end
+          end
+        end
+        
+        # Record that last time we updated
+        Qbo.update_time_stamp
+        ActiveRecord::Base.connection.close
+      end
+      # The webhook doesn't require a response but let's make sure we don't send anything
+      render :nothing => true, status: 200
+    else
+      render nothing: true, status: 400
+    end
+
+    logger.info "Quickbooks webhook complete"
+  end
 
   #
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
+    logger.info "Syncing EVERYTHING"
+    # Update info in background
+    Thread.new do
       if Qbo.exists?
-      QboCustomer.update_all
-      QboItem.update_all
-      QboEmployee.update_all
-      QboEstimate.update_all
-      QboInvoice.update_all
-      QboPurchase.update_all
+        Customer.sync
+        Invoice.sync
+        Employee.sync
+        Estimate.sync
+        
+        # Record the last sync time
+        Qbo.update_time_stamp
+      end
+      ActiveRecord::Base.connection.close
     end
 
-    redirect_to qbo_path(:redmine_qbo), :flash => { :notice => "Successfully synced to 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) 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:
 #
@@ -8,35 +8,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.
 
-require_dependency 'issue'
+module AuthHelper
 
-# 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 :qbo_customer, primary_key: :id
-      belongs_to :qbo_item, primary_key: :id
-      belongs_to :qbo_estimate, primary_key: :id
-      belongs_to :qbo_invoice, primary_key: :id
+  def require_user
+    return unless session[:token].nil?
+    if !User.current.logged?
+      render_403
     end
   end
   
-  module ClassMethods
-    
+  def allowed_to?(action)
+    return false if User.current.nil?
+    project = Project.find(params[:project_id])
+    return false if project.nil?
+    return true if User.current.allowed_to?(action, project)
+    false
   end
   
-  module InstanceMethods
+  def check_permission(permission)
+    if !allowed_to?(permission)
+      render_403
+    end
+  end
   
+  
+  def global_check_permission(permission)
+    if !globaly_allowed_to?(permission)
+      render_403
+    end
+  end
+  
+  def globaly_allowed_to?( action)
+    return false if User.current.nil?
+
+    projects = Project.all
+    projects.each { |p|
+      if User.current.allowed_to?(action, p)
+        return true
+      end
+    }
+    false
   end
     
 end
-
-# Add module to Issue
-Issue.send(:include, IssuePatch)

app/helpers/estimate_helper.rb

@@ -1,2 +0,0 @@
-module EstimateHelper
-end

app/helpers/invoice_helper.rb

@@ -1,2 +0,0 @@
-module InvoiceHelper
-end

app/models/concerns/quickbooks_oauth.rb

@@ -0,0 +1,88 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module QuickbooksOauth
+  extend ActiveSupport::Concern
+
+  #== Instance Methods
+
+  def perform_authenticated_request(&block)
+    attempts = 0
+    begin
+      yield oauth_access_token
+    rescue OAuth2::Error, Quickbooks::AuthorizationFailure => ex
+      Rails.logger.error("QuickbooksOauth.perform: #{ex.message}")
+
+      # to prevent an infinite loop here keep a counter and bail out after N times...
+      attempts += 1
+
+      raise "QuickbooksOauth:ExceededAuthAttempts" if attempts >= 3
+
+      # check if its an invalid_grant first, but assume it is for now
+      refresh_token!
+
+      retry
+    end
+  end
+
+  def refresh_token!
+    Rails.logger.info("QuickbooksOauth.refresh_token!")
+    t = oauth_access_token
+    refreshed = t.refresh!
+
+    if refreshed.params['x_refresh_token_expires_in'].to_i > 0
+      oauth2_refresh_token_expires_at = Time.now + refreshed.params['x_refresh_token_expires_in'].to_i.seconds
+    else
+      oauth2_refresh_token_expires_at = 100.days.from_now
+    end
+
+    Rails.logger.info("QuickbooksOauth.refresh_token!: #{oauth2_refresh_token_expires_at}")
+
+    update!(
+      oauth2_access_token: refreshed.token,
+      oauth2_access_token_expires_at: Time.at(refreshed.expires_at),
+      oauth2_refresh_token: refreshed.refresh_token,
+      oauth2_refresh_token_expires_at: oauth2_refresh_token_expires_at
+    )
+  end
+
+  def oauth_client
+    self.class.construct_oauth2_client
+  end
+
+  def oauth_access_token
+    OAuth2::AccessToken.new(oauth_client, oauth2_access_token, refresh_token: oauth2_refresh_token)
+  end
+
+  def consumer
+    oauth_access_token
+  end
+
+  module ClassMethods
+
+    def construct_oauth2_client
+
+      oauth_consumer_key = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
+      oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+
+      # Are we are playing in the sandbox?
+      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo['sandbox'] ? true : false
+      logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}"
+
+      options = {
+        site: "https://appcenter.intuit.com/connect/oauth2",
+        authorize_url: "https://appcenter.intuit.com/connect/oauth2",
+        token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
+      }
+      OAuth2::Client.new(oauth_consumer_key, oauth_consumer_secret, options)
+    end
+
+  end
+end

app/models/customer.rb

@@ -0,0 +1,238 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Customer < ActiveRecord::Base
+  
+  has_many :issues
+  has_many :invoices
+  has_many :estimates
+ 
+  validates_presence_of :id, :name
+  
+  self.primary_key = :id
+  
+  # returns a human readable string
+  def to_s
+    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
+  end
+  
+  # Convenience Method
+  # returns the customer's email
+  def email
+    pull unless @details
+    begin
+      return @details.email_address.address
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Sets the email
+  def email=(s)
+    pull unless @details
+    @details.email_address = s
+  end
+  
+  # Convenience Method
+  # returns the customer's primary phone
+  def primary_phone
+    pull unless @details
+    begin
+      return @details.primary_phone.free_form_number
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Updates the customer's primary phone number
+  def primary_phone=(n)
+    pull unless @details
+    pn = Quickbooks::Model::TelephoneNumber.new
+    pn.free_form_number = n
+    @details.primary_phone = pn
+    #update our locally stored number too
+    update_phone_number
+  end
+  
+  # Convenience Method
+  # returns the customer's mobile phone
+  def mobile_phone
+    pull unless @details
+    begin
+      return @details.mobile_phone.free_form_number
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Updates the custome's mobile phone number
+  def mobile_phone=(n)
+    pull unless @details
+    pn = Quickbooks::Model::TelephoneNumber.new
+    pn.free_form_number = n
+    @details.mobile_phone = pn
+    #update our locally stored number too
+    update_mobile_phone_number
+  end
+
+  # Convenience Method
+  # Sets the notes
+  def notes=(s)
+    pull unless @details
+    @details.notes = s
+  end
+  
+  # update the localy stored phone number as a plain string with no special chars
+  def update_phone_number
+    begin
+      self.phone_number = self.primary_phone.tr('^0-9', '')
+    rescue
+      return nil
+    end
+  end
+  
+  # update the localy stored phone number as a plain string with no special chars
+  def update_mobile_phone_number
+    begin
+      self.mobile_phone_number = self.mobile_phone.tr('^0-9', '')
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Updates Both local DB name & QBO display_name
+  def name=(s)
+    pull unless @details
+    @details.display_name = s
+    super
+  end
+  
+  # Magic Method
+  # Maps Get/Set methods to QBO customer object
+  def method_missing(sym, *arguments)
+    # Check to see if the method exists
+    if Quickbooks::Model::Customer.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="
+        @details.method(method_name).call(arguments[0])
+      # Getter
+      else
+        return @details.method(method_name).call 
+      end
+    end
+  end
+  
+  # proforms a bruteforce sync operation
+  # This needs to be simplified
+  def self.sync 
+    # Sync ALL customers if the database is empty
+    qbo = Qbo.first
+    customers = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all
+    end
+    
+    return unless customers
+    
+    customers.each do |c|
+      logger.info "Processing customer #{c.id}"
+      customer = Customer.find_or_create_by(id: c.id)
+      if c.active?
+        #if not customer.name.eql? c.display_name
+          customer.name = c.display_name
+          customer.id = c.id
+          customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
+          customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
+          customer.save_without_push
+        #end
+      else
+        if not c.new_record?
+          customer.delete
+        end
+      end
+    end
+  end
+  
+  # Searchs the database for a customer by name or phone number with out special chars
+  def self.search(search)
+    customers = where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
+    return customers.order(:name)
+  end
+  
+  # proforms a bruteforce sync operation
+  # This needs to be simplified
+  def self.sync_by_id(id) 
+    qbo = Qbo.first
+    c = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
+
+    return unless c
+
+    customer = Customer.find_or_create_by(id: c.id)
+    if c.active?
+      #if not customer.name.eql? c.display_name
+        customer.name = c.display_name
+        customer.id = c.id
+        customer.phone_number = c.primary_phone.free_form_number.tr('^0-9', '') unless c.primary_phone.nil?
+        customer.mobile_phone_number = c.mobile_phone.free_form_number.tr('^0-9', '') unless c.mobile_phone.nil?
+        customer.save_without_push
+      #end
+    else
+      if not customer.new_record?
+        customer.delete
+      end
+    end
+  end
+  
+  # Push the updates
+  def save_with_push
+    begin
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.update(@details)
+      end
+      #raise "QBO Fault" if @details.fault?
+      self.id = @details.id
+    rescue Exception => e
+      errors.add(e.message)
+    end
+    save_without_push
+  end
+  
+  alias_method :save_without_push, :save
+  alias_method :save, :save_with_push
+  
+  private
+  
+  # pull the details
+  def pull
+    begin
+      raise Exception unless self.id
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
+    rescue Exception => e
+      @details = Quickbooks::Model::Customer.new
+    end
+  end
+  
+end

app/models/customer_token.rb

@@ -0,0 +1,61 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class CustomerToken < ActiveRecord::Base
+  
+  has_many :issues
+  validates_presence_of :issue_id
+  before_create :generate_token, :generate_expire_date
+  attr_accessor :destroyed
+  after_destroy :mark_as_destroyed
+
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE__' + SecureRandom.uuid
+  
+  # generates a random token using the plugin setting settingsOAuthConsumerSecret for salt
+  def generate_token
+    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
+  end
+
+  # generates an expiring date
+  def generate_expire_date
+    self.expires_at = Time.now + 1.month
+  end
+
+  # set destroyed flag
+  def mark_as_destroyed
+    self.destroyed = true
+  end
+
+  # purge expired tokens
+  def self.remove_expired_tokens
+    where("expires_at < ?", Time.now).destroy_all
+  end
+  
+  # has the token expired?
+  def expired?
+    self.expires_at < Time.now
+  end
+
+  # Getter convenience method for tokens
+  def self.get_token(issue)
+    
+    # check to see if token exists & if it is expired
+    token = find_by_issue_id issue.id
+    unless token.nil?
+      return token unless token.expired?
+      # remove expired tokens
+      token.destroy
+    end
+
+    # only create new token if we have an issue to attach it to
+    return create(:issue_id => issue.id) if User.current.logged?
+  end
+
+end

app/models/employee.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:
 #
@@ -8,35 +8,43 @@
 #
 #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 QboCustomer < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  has_many :qbo_purchases
-  attr_accessible :name
+class Employee < ActiveRecord::Base
+  
+  has_many :users
   validates_presence_of :id, :name
   
-   def self.get_base
-    Qbo.get_base(:customer)
+  def self.sync 
+    qbo = Qbo.first
+    employees = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all
     end
 
-  def self.get_customer (id)
-    get_base.service.find_by_id(id)
-  end
-
-  def self.update_all 
-    customers = get_base.service.all
+    return unless employees
     
     transaction do
-      # Update the customer table
-      customers.each { |customer|
-        qbo_customer = QboCustomer.find_or_create_by(id: customer.id)
-        qbo_customer.name = customer.display_name
-        qbo_customer.id = customer.id
-        qbo_customer.save!
+      # Update the item table
+      employees.each { |e|
+        logger.info "Processing employee #{e.id}"
+        employee = 	find_or_create_by(id: e.id)
+        employee.name = e.display_name
+        employee.id = e.id
+        employee.save!
       }
     end
+  end
 
-    #remove deleted customers
-    where.not(customers.map(&:id)).destroy_all
+  def self.sync_by_id(id)
+    qbo = Qbo.first
+    employee = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
+
+    return unless employee
+    employee = find_or_create_by(id: employee.id)
+    employee.name = employee.display_name
+    employee.id = employee.id
+    employee.save!
   end
 end

app/models/estimate.rb

@@ -0,0 +1,129 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Estimate < ActiveRecord::Base
+  
+  has_and_belongs_to_many :issues
+  belongs_to :customer 
+  validates_presence_of :doc_number, :id
+  self.primary_key = :id
+  
+  # sync all estimates
+  def self.sync
+    logger.info "Syncing ALL estimates"
+    qbo = Qbo.first
+    estimates = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all
+    end
+
+    return unless estimates
+
+    estimates.each { |estimate|
+      process_estimate(estimate)
+    }
+
+    #remove deleted estimates
+    where.not(estimates.map(&:id)).destroy_all
+  end
+  
+  # sync only one estimate
+  def self.sync_by_id(id)
+    logger.info "Syncing estimate #{id}"
+    qbo = Qbo.first
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      process_estimate(service.fetch_by_id(id))
+    end
+  end
+
+  # sync only one estimate
+  def self.sync_by_doc_number(number)
+    logger.info "Syncing estimate by doc number #{number}"
+    qbo = Qbo.first
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      process_estimate(service.find_by( :doc_number, number).first)
+    end
+  end
+  
+  # update an estimate
+  def self.update(id)
+    # Update the item table
+    qbo = Qbo.first
+    estimate = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
+
+    return unless estimate
+
+    e = find_or_create_by(id: id)
+    e.doc_number = estimate.doc_number
+    e.txn_date = estimate.txn_date
+    e.save!
+  end
+  
+  # process an estimate into the database
+  def self.process_estimate(qbo_estimate)
+    logger.info "Processing estimate #{qbo_estimate.id}"
+    estimate = find_or_create_by(id: qbo_estimate.id)
+    estimate.doc_number = qbo_estimate.doc_number
+    estimate.customer_id = qbo_estimate.customer_ref.value
+    estimate.id = qbo_estimate.id
+    estimate.txn_date = qbo_estimate.txn_date
+    estimate.save!
+  end
+
+  # download the pdf from quickbooks
+  def pdf
+    qbo = Qbo.first
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      estimate = service.fetch_by_id(id)
+      service.pdf(estimate)
+    end
+  end
+
+  # Magic Method
+  # Maps Get/Set methods to QBO estimate object
+  def method_missing(sym, *arguments)
+    # Check to see if the method exists
+    if Quickbooks::Model::Estimate.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="
+        @details.method(method_name).call(arguments[0])
+      # Getter
+      else
+        return @details.method(method_name).call 
+      end
+    end
+  end
+
+  private
+  
+  # pull the details
+  def pull
+    begin
+      raise Exception unless self.id
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service(:estimate).fetch_by_id(self.id)
+      end
+    rescue Exception => e
+      @details = Quickbooks::Model::Estimate.new
+    end
+  end
+  
+end

app/models/invoice.rb

@@ -0,0 +1,203 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Invoice < ActiveRecord::Base
+  
+  has_and_belongs_to_many :issues
+  belongs_to :customer 
+  validates_presence_of :doc_number, :id, :customer_id, :txn_date
+  self.primary_key = :id
+  
+  # sync ALL the invoices
+  def self.sync
+    logger.info "Syncing all invoices"
+    last = Qbo.first.last_sync
+
+    query = "SELECT Id, DocNumber FROM Invoice"
+    query << " WHERE Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
+  
+    # TODO actually do something with the above query
+    # .all() is never called since count is never initialized
+    qbo = Qbo.first
+    invoices = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all 
+    end
+
+    return unless invoices
+     
+    invoices.each { | invoice | 
+      process_invoice invoice
+    }
+  end
+  
+  #sync by invoice ID
+  def self.sync_by_id(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)
+      invoice = service.fetch_by_id(id) 
+      process_invoice invoice
+    end
+  end
+  
+  private
+  
+  # Attach the invoice to the issue
+  def self.attach_to_issue(issue, invoice)
+    return if issue.nil?
+    
+    # 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.info "Attaching invoice #{invoice.id} to issue #{issue.id}"
+    
+    invoice = Invoice.find_or_create_by(id: invoice.id)
+
+    unless issue.invoices.include?(invoice)
+      issue.invoices << invoice
+      issue.save!
+    end
+    
+    compare_custom_fields(issue, invoice)
+  end
+  
+  # processes the invoice into the database
+  def self.process_invoice(i)
+    logger.info "Processing invoice #{i.id}"
+
+    # Load the invoice into the database
+    invoice = Invoice.find_or_create_by(id: i.id)
+    invoice.doc_number = i.doc_number 
+    invoice.id = i.id
+    invoice.customer_id = i.customer_ref
+    invoice.txn_date = i.txn_date
+    invoice.save!
+
+    # Scan the private notes for hashtags and attach to the applicable issues
+    if not i.private_note.nil?
+      i.private_note.scan(/#(\w+)/).flatten.each { |issue|
+        attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+      }
+    end
+    
+    # Scan the line items for hashtags and attach to the applicable issues
+    i.line_items.each { |line|
+      if line.description
+        line.description.scan(/#(\w+)/).flatten.each { |issue|
+          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+        }
+      end
+    }
+  end
+  
+  # compares the custome fields on invoices & issues and updates the invoice as needed
+  #
+  # the issue here is when two or more issues share an invoice with the same custom field, but diffrent values
+  # 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"
+    # 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 } 
+
+    # Process updates from the hooks
+    context.each do |c|
+      unless c.nil?
+        logger.debug "Invoice.compare_custom_fields: We have a responce from a hook"
+        push_updates  c[:invoice] if c[:is_changed]
+      end
+    end
+      
+    # Process Issue Custom Values
+    begin
+      value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
+      
+      # Check to see if the value is blank...
+      if not value.value.to_s.blank?
+        # Check to see if the value is diffrent
+        if not cf.string_value.to_s.eql? value.value.to_s
+          # update the custom field on the invoice
+          cf.string_value = value.value.to_s
+          is_changed = true
+        end
+      end
+    rescue
+      # Nothing to do here, there is no match
+    end
+
+    push_updates invoice if is_changed
+  end
+
+  # pushes invoice updates
+  def self.push_updates(invoice)
+    begin
+      logger.info "Invoice.push_updates"
+      qbo = Qbo.first
+      qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.update invoice
+      end
+    rescue
+      # Do nothing, probaly custome field sync confict on the invoice. 
+      # This is a problem with how it's billed
+      # TODO Add notes in memo area
+      # TODO flag Invoice.cf_sync_confict here
+      logger.error "Failed to update invoice"
+    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)
+    # Check to see if the method exists
+    if Quickbooks::Model::Invoice.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="
+        @details.method(method_name).call(arguments[0])
+      # Getter
+      else
+        return @details.method(method_name).call 
+      end
+    end
+  end
+  
+  # pull the details from quickbooks
+  def pull
+    begin
+      raise Exception unless self.id
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
+    rescue Exception => e
+      @details = Quickbooks::Model::Invoice.new
+    end
+  end
+    
+end

app/models/qbo.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:
 #
@@ -9,35 +9,20 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class Qbo < ActiveRecord::Base
-  unloadable
-  validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
     
-  QB_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-  QB_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+  include QuickbooksOauth
+  include Redmine::I18n
   
-  # Quickbooks Config Info
-  $qb_oauth_consumer = OAuth::Consumer.new(QB_KEY, QB_SECRET, {
-    :site                 => "https://oauth.intuit.com",
-    :request_token_path   => "/oauth/v1/get_request_token",
-    :authorize_url        => "https://appcenter.intuit.com/Connect/Begin",
-    :access_token_path    => "/oauth/v1/get_access_token"
-  })
-
-  # Configure quickbooks-ruby-base to access our database
-  Quickbooks::Base.configure do |c|
-      c.persistent_token = 'qb_token'
-      c.persistent_secret = 'qb_secret'
-      c.persistent_company_id =  'company_id'
+  # Updates last sync time stamp
+  def self.update_time_stamp
+    date = DateTime.now
+    logger.info "Updating QBO timestamp to #{date}"
+    qbo = Qbo.first
+    qbo.last_sync = date
+    qbo.save
   end
   
-  # Get a quickbooks base object for type
-  # @params type of base
-  def self.get_base(type)
-    Quickbooks::Base.new(first, type)
-  end
-   
-   # Get the QBO account
-  def self.get_account
-    first
+  def self.last_sync
+    format_time(Qbo.first.last_sync)
   end
 end

app/models/qbo_estimate.rb

@@ -1,45 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 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 QboEstimate < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
-  
-  def self.get_base
-    Qbo.get_base(:estimate)
-  end
-  
-  def self.update_all 
-    estimates = get_base.service.all
-  
-    # Update the item table
-    transaction do
-        estimates.each { |estimate|
-          qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
-          qbo_estimate.doc_number = estimate.doc_number
-          qbo_estimate.id = estimate.id
-          qbo_estimate.save!
-        }
-    end
-    
-    #remove deleted estimates
-    where.not(estimates.map(&:id)).destroy_all
-  end
-  
-  def self.update(id)
-    # Update the item table
-    estimate = get_base.service.fetch_by_id(id)
-      qbo_estimate = QboEstimate.find_or_create_by(id: id)
-      qbo_estimate.doc_number = estimate.doc_number
-      qbo_estimate.save!
-  end
-end

app/models/qbo_invoice.rb

@@ -1,46 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 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 QboInvoice < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
-  
-  def self.get_base
-    Qbo.get_base(:invoice)
-  end
-  
-  def self.update_all
-    #Pull the invoices from the quickbooks server
-    invoices = get_base.service.all
-    
-    # Update the invoice table 
-    transaction do
-      invoices.each { | invoice | 
-        qbo_invoice = find_or_create_by(id: invoice.id) 
-	qbo_invoice.doc_number = invoice.doc_number 
-	qbo_invoice.id = invoice.id
-	qbo_invoice.save! 
-      }
-    end 
-    
-    #remove deleted invoices 
-    where.not(invoices.map(&:id)).destroy_all
-  end
-  
-  def self.update(id)
-    # Update the item table
-    invoice = get_base.service.fetch_by_id(id)
-      qbo_invoice = find_or_create_by(id: id)
-      qbo_invoice.doc_number = invoice.doc_number
-      qbo_invoice.save!
-  end
-end

app/models/qbo_purchase.rb

@@ -1,47 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 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 QboPurchase < ActiveRecord::Base
-  unloadable
-  belongs_to :issues
-  belongs_to :qbo_customer
-  attr_accessible :description
-  validates_presence_of :id, :line_id, :description, :qbo_customer_id
-  
-  def self.get_base
-    Qbo.get_base(:purchase)
-  end
-
-  def self.get_purchase(id)
-    get_base.service.find_by_id(id)
-  end
-
-  def self.update_all
-   QboPurchase.get_base.service.all.each { |purchase|
-      
-      purchase.line_items.all? { |line_item|
-        
-        detail = line_item.account_based_expense_line_detail ? line_item.account_based_expense_line_detail : line_item.item_based_expense_line_detail
-        
-        if detail.billable_status =  "Billable"
-            qbo_purchase = find_or_create_by(id: purchase.id)
-            qbo_purchase.line_id = line_item.id
-            qbo_purchase.description = line_item.description
-            qbo_purchase.qbo_customer_id = detail.customer_ref
-            
-            #TODO attach to issues
-            #qbo_purchase.issue_id = Issue.find_by_invoice()
-            
-            qbo_purchase.save
-        end
-      }
-    }
-  end
-end

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

@@ -0,0 +1,60 @@
+<table>
+  <tbody>
+
+    <tr>
+      <th><%=t(:label_name)%></th>
+      <td><%= customer.name %></td>
+    </tr>
+
+    <tr>
+      <th><%=t(:label_email)%></th>
+      <td><%= customer.email %></td>
+    </tr>
+    
+    <tr>
+      <th><%=t(:label_primary_phone)%></th>
+      <td><%= number_to_phone(customer.primary_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.primary_phone %></td>
+    </tr>
+    
+    <tr>
+      <th><%=t(:label_mobile_phone)%></th>
+      <td><%= number_to_phone(customer.mobile_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.mobile_phone %></td>
+    </tr>
+    
+     <tr>
+        <th><%=t(:label_billing_address)%></th>
+        <td><%= @billing_address %></td>
+    </tr>
+    
+     <tr>
+        <th><%=t(:label_shipping_address)%></th>
+        <td><%= @shipping_address %></td>
+    </tr>
+    
+    <tr>
+        <th><%=t(:label_account_balance)%></th>
+        <td>$<%= customer.balance %></td>
+    </tr>
+    
+    <tr>
+      <th colspan="2"><h4><%=t(:field_notes)%></hr></th>
+    </tr>
+
+    <tr>
+      <td colspan="2">
+       <pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit;">
+          <%= customer.notes %>
+        </pre>
+      </td>
+    </tr>
+
+    <script>
+        const preElement = document.getElementById('note-display');
+        // This takes the text, trims the edges, and puts it back
+        preElement.textContent = preElement.textContent.trim();
+      </script>
+
+  </tbody>
+</table> 
+<br/>
+<br/>

app/views/customers/_form.html.erb

@@ -0,0 +1,59 @@
+<div class="row">
+  <div class="span6 columns">
+    <fieldset>
+
+      <%= form_for @customer do |f| %> 
+       
+        <div class="clearfix">
+          <%=t(:label_display_name)%> 
+          <div class="input">
+            <%= f.text_field :name, :required => true, :autocomplete => "off" %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          <%=t(:label_primary_phone)%>
+          <div class="input">
+            <%= f.telephone_field :primary_phone, :autocomplete => "off" %>
+          </div>
+        </div>
+        
+       <div class="clearfix">
+          <%=t(:label_mobile_phone)%>:
+          <div class="input">
+            <%= f.telephone_field :mobile_phone, :autocomplete => "off" %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          <%=t(:label_email)%>:
+          <div class="input">
+            <%= f.email_field :email, :autocomplete => "off" %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          <%=t(:field_notes)%>: 
+          <div class="input">
+            <p>  
+              <%= content_tag 'span', :id => "issue_description_and_toolbar" do %>
+              <%= f.text_area :notes,
+                    :cols => 60,
+                    :rows => 10,
+                    :accesskey => accesskey(:edit),
+                    :class => 'wiki-edit',
+                    :no_label => true %>
+              <% end %>
+            </p>
+            <%= wikitoolbar_for 'issue_description' %>
+          </div>
+        </div>
+        
+       <div class="actions">
+        <%= f.submit %>
+       </div>
+      <% end %>
+
+    </fieldset>
+  </div>
+</div>

app/views/customers/_search.html.erb

@@ -0,0 +1,5 @@
+<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+    <%= submit_tag t(:label_search) %>
+<% end %>
+<%= button_to t(:label_new_customer), new_customer_path, method: :get%>

app/views/customers/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<h3><%=t(:label_customers)%></h3>
+<%= render :partial => 'customers/search' %>

app/views/customers/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%=t(:label_edit_customer)%></h1> 
+<br/> 
+<%= render :partial => 'customers/form' %>

app/views/customers/filter_estimates_by_customer.js.erb

@@ -0,0 +1 @@
+$('select#issue_estimate_id').html('<%= j content_tag(:option,'',:value=>"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');

app/views/customers/index.html.erb

@@ -0,0 +1,24 @@
+<h2><%=t(:field_customers)%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<% if @customers.present? %>
+  <br/>
+  <% @customers.each do |c| %>
+    <div class="row">
+      <div class="span6 columns">
+        <%= link_to c, customer_path(c.id) %>
+      </div>
+    </div>
+  <% end %>
+
+<p><%=t(:label_matching)%> <%= @customers.count %> <%=t(:field_customers)%> </p>
+
+<div class="actions">
+  <%= will_paginate @customers %>
+</div>
+
+<% else %>
+  <p><%=t(:label_no_customers)%> <%= params[:search] %>.</p>
+<% end %>
+
+<div>
+  <%= render :partial => 'qbo/stats' %>
+</div>

app/views/customers/new.html.erb

@@ -0,0 +1,3 @@
+<h2><%=t(:label_new_customer)%></h2> 
+<br/>
+<%= render :partial => 'customers/form' %>

app/views/customers/show.html.erb

@@ -0,0 +1,53 @@
+<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">
+
+      <div class="splitcontentleft">
+
+        <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">
+            <h4><%=t(:estimates)%>:</h4>
+            <%= render :partial => 'estimates/list', locals: {customer: @customer} %>
+          </div>
+
+          <div class="splitcontentleft">
+            <h4><%=t(:label_invoices)%>:</h4>
+            <%= render :partial => 'invoices/list', locals: {customer: @customer} %>
+          </div>
+        </div>
+
+      </div>
+        
+      <div class="splitcontentleft">
+        <%= call_hook :show_customer_view_right, {customer: @customer} %>
+      </div>
+    </div>
+
+  </div>
+
+<br/>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+
+<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%> - <%= @closed_hours.round(1)%> <%=t(:label_hours)%></h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>

app/views/customers/view.html.erb

@@ -0,0 +1,111 @@
+<p style="float: right;"> <%= copy_object_url_link(request.url) %> </p>
+
+<h2><%= issue_heading(@issue) %></h2>
+
+<div class="<%= @issue.css_classes %> details">
+
+<%= avatar(@issue.author, :size => "50") %>
+
+<div class="subject">
+<%= render_issue_subject_with_tree(@issue) %>
+<%=t(:label_customer_link_expires)%> <%= distance_of_time_in_words(Time.now, @token.expires_at) %>
+</div>
+        <p class="author">
+        <%= authoring @issue.created_on, @issue.author %>.
+        <% if @issue.created_on != @issue.updated_on %>
+        <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
+        <% end %>
+        </p>
+
+<div class="attributes">
+<%= issue_fields_rows do |rows|
+  rows.left l(:field_status), @issue.status.name, :class => 'status'
+  rows.left l(:field_priority), @issue.priority.name, :class => 'priority'
+  unless @issue.disabled_core_fields.include?('assigned_to_id')
+    rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? @issue.assigned_to : "-"), :class => 'assigned-to'
+  end
+  unless @issue.disabled_core_fields.include?('category_id') || (@issue.category.nil? && @issue.project.issue_categories.none?)
+    rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category'
+  end
+  unless @issue.disabled_core_fields.include?('fixed_version_id') || (@issue.fixed_version.nil? && @issue.assignable_versions.none?)
+    rows.left l(:field_fixed_version), (@issue.fixed_version ? @issue.fixed_version : "-"), :class => 'fixed-version'
+  end
+  unless @issue.disabled_core_fields.include?('start_date')
+    rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
+  end
+  unless @issue.disabled_core_fields.include?('due_date')
+    rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
+  end
+  unless @issue.disabled_core_fields.include?('done_ratio')
+    rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :legend => "#{@issue.done_ratio}%"), :class => 'progress'
+  end
+  unless @issue.disabled_core_fields.include?('estimated_hours')
+    if @issue.estimated_hours.present? || @issue.total_estimated_hours.to_f > 0
+      rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
+    end
+  end
+  #if User.current.allowed_to_view_all_time_entries?(@project)
+    if @issue.total_spent_hours > 0
+      rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
+    end
+  #end
+end %>
+<%= render_full_width_custom_fields_rows(@issue) %>
+<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+</div>
+
+<% if @issue.description? || @issue.attachments.any? -%>
+<hr />
+<% if @issue.description? %>
+<div class="description">
+  <div class="contextual">
+  <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if @issue.notes_addable? %>
+  </div>
+
+  <p><strong><%=l(:field_description)%></strong></p>
+  <div class="wiki">
+  <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+  </div>
+</div>
+<% end %>
+<%= link_to_attachments @issue, :thumbnails => true %>
+<% end -%>
+
+<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+
+<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
+<hr />
+<div id="issue_tree">
+<div class="contextual">
+  <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
+</div>
+<p><strong><%=l(:label_subtask_plural)%></strong></p>
+<%= render_descendants_tree(@issue) unless @issue.leaf? %>
+</div>
+<% end %>
+
+<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
+<hr />
+<div id="relations">
+<%= render :partial => 'issues/relations' %>
+</div>
+<% end %>
+
+</div>
+
+<% if @changesets.present? %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'issues/changesets', :locals => { :changesets => @changesets} %>
+</div>
+<% end %>
+
+<% if @journals.present? %>
+<div id="history">
+<h3><%=l(:label_history)%></h3>
+<%= render :partial => 'issues/history', :locals => { :issue => @issue, :journals => @journals } %>
+</div>
+<% end %>
+
+
+<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>

app/views/estimates/_list.html.erb

@@ -0,0 +1,11 @@
+<% if @customer.present? %>
+
+  <% @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>
+  <% end %>
+
+<% else %>
+  <p><%=t(:label_no_estimates)%>.</p>
+<% end %>

app/views/estimates/_search.html.erb

@@ -0,0 +1,4 @@
+<%= form_tag(estimate_doc_path, :method => "get") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), :autocomplete => "off" %>
+    <%= submit_tag t(:label_search), :formtarget => "_blank" %>
+<% end %>

app/views/estimates/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<h3><%=t(:label_estimates) %></h3>
+<%= render :partial => 'estimates/search' %>

app/views/invoices/_list.html.erb

@@ -0,0 +1,28 @@
+<% if @customer.present? %>
+
+  <%= 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

@@ -0,0 +1,9 @@
+<p>
+    <label for="issue_customer"><%= t(:customer) %></label>
+    <%= search_customer %> 
+    <%= customer_id %> 
+</p> 
+
+<p>
+    <%= select_estimate %>
+</p> 

app/views/issues/_history.html.erb

@@ -0,0 +1,35 @@
+<% reply_links = issue.notes_addable? -%>
+<% for journal in journals %>
+  <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
+    <div id="note-<%= journal.indice %>">
+    <div class="contextual">
+      <span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span>
+      <a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>
+    </div>
+    <h4>
+      <%= avatar(journal.user, :size => "24") %>
+      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+      <%= render_private_notes_indicator(journal) %>
+    </h4>
+
+    <% if journal.details.any? %>
+    <ul class="details">
+      <% details_to_strings(journal.visible_details).each do |string| %>
+       <li><%= string %></li>
+      <% end %>
+    </ul>
+    <% if Setting.thumbnails_enabled? && (thumbnail_attachments = journal_thumbnail_attachments(journal)).any? %>
+      <div class="thumbnails">
+        <% thumbnail_attachments.each do |attachment| %>
+          <div><%= thumbnail_tag(attachment) %></div>
+        <% end %>
+      </div>
+    <% end %>
+    <% end %>
+    <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
+    </div>
+  </div>
+  <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
+<% end %>
+
+<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>

app/views/issues/_list_simple.html.erb

@@ -0,0 +1,29 @@
+<% if issues && issues.any? %>
+<%= form_tag({}) do %>
+  <table class="list issues">
+    <thead><tr>
+    <th>#</th>
+    <th><%=l(:field_project)%></th>
+    <th><%=l(:field_tracker)%></th>
+    <th><%=l(:field_subject)%></th>
+    </tr></thead>
+    <tbody>
+    <% for issue in issues %>
+    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+      <td class="id">
+        <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
+        <%= link_to(issue.id, issue_path(issue)) %>
+      </td>
+      <td class="project"><%= link_to_project(issue.project) %></td>
+      <td class="tracker"><%= issue.tracker %></td>
+      <td class="subject">
+        <%= link_to(issue.subject.truncate(60), issue_path(issue)) %> (<%= issue.status %>)
+      </td>
+    </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% end %>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>

app/views/issues/_show_details.html.erb

@@ -0,0 +1,22 @@
+<div class="splitcontent"> 
+  <div class="splitcontentleft">
+    <div class="customer_id attribute">
+      <div class="label"><span><%=t(:field_customer)%></span>:</div>
+      <div class="value"><%= customer %></div>
+    </div>
+  
+    <div class="estimate_id attribute">
+      <div class="label"><span><%=t(:field_estimate)%></span>:</div>
+      <div class="value"><%= estimate_link %></div>
+    </div>
+         
+    <div class="invoice_id attribute">
+      <div class="label"><span><%=t(:field_invoice)%></span>:</div>
+      <div class="value"><%= invoice_link %></div>
+    </div>
+   </div>
+      
+  <div class="splitcontentleft">
+    <%= call_hook :show_issue_view_right, {issue: issue} %>
+  </div>
+</div>

app/views/qbo/_last_sync.html.erb

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

app/views/qbo/_settings.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:
 
@@ -10,49 +10,102 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 -->
 
+<!-- somewhere in your document include the Javascript -->
+<script type="text/javascript" src="https://appcenter.intuit.com/Content/IA/intuit.ipp.anywhere.js"></script>
+
+<!-- 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: '<%= qbo_authenticate_path %>'});
+</script>
+
 <table >
   <tbody>
+  
     <tr>
-      <th>OAuth Consumer Key</th>
+      <th><%=t(:label_client_id)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerKey" 
           value="<%= settings['settingsOAuthConsumerKey'] %>" 
           name="settings[settingsOAuthConsumerKey]" >
       </td>
     </tr>
 
     <tr>
-      <th>OAuth Consumer Secret</th>
+      <th><%=t(:label_client_secret)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerSecret"
           value="<%= settings['settingsOAuthConsumerSecret'] %>"
           name="settings[settingsOAuthConsumerSecret]" >
       </td>
     </tr>
     
-  </tbody>
-</table>
-
-<br/>
-
-<table>
-  <tbody>
-
     <tr>
-       <th>Token Expires At</th>
-       <td><%= if Qbo.exists? then Qbo.first.token_expires_at end %>
+      <th><%=t(:label_webhook_token)%></th>
+      <td>
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsWebhookToken"
+          value="<%= settings['settingsWebhookToken'] %>"
+          name="settings[settingsWebhookToken]" >
+      </td>
     </tr>
 
     <tr>
-       <th>Reconnect Token At</th>
-       <td><%= if Qbo.exists? then Qbo.first.reconnect_token_at end  %>
+      <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 %>
+      </tr>
+      
+      <tr>
+        <th><%=t(:label_oauth2_refresh_token_expires_at)%></th>
+        <td><%= if Qbo.exists? then Qbo.first.oauth2_refresh_token_expires_at end %>
      </tr>
 
   </tbody>
 </table>
 
 <br/>
-Note: You need to authenticate after saving your key and secret above
+<%=t(:label_oauth_note)%>
+<br/>
 <br/>
 
-<%= link_to "Authenticate", qbo_authenticate_path, :method => :get  %>
+<!-- this will display a button that the user clicks to start the flow -->
+<ipp:connectToIntuit></ipp:connectToIntuit>
+
+<br/>
+<br/>
+
+<div>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%>
+    </div>
+      
+    <div>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %>
+    </div>
+    
+    <div>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %>
+    </div>
+    
+    <div>
+        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %>
+    </div>
+      
+    <br/>
+    
+    <div>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path %>
+</div>

app/views/qbo/_sidebar.html.erb

@@ -0,0 +1,6 @@
+<% if User.current.logged? %>
+
+    <%= render :partial => 'customers/sidebar' %>
+    <%= render :partial => 'estimates/sidebar' %>
+
+<% end %>

app/views/qbo/_stats.html.erb

@@ -0,0 +1 @@
+<%= Customer.count %> <%=t(:field_customers)%> - <%= render :partial => 'qbo/last_sync' %>

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:
 
@@ -30,4 +30,3 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
         intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= authenticate_vendors_url %>'});
     </script>
   </body>
-

app/views/qbo/index.html.erb

@@ -1,55 +0,0 @@
-<!--
-The MIT License (MIT)
-
-Copyright (c) 2016 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.
--->
-
-<body>
-    <h1> Redmine Quickbooks</h1>
-    <%= form_for @qbo do |f|%>   
-      <div>
-        <%= f.label "Customer Count:"+@qbo_customer_count.to_s%>
-        <br/>
-        <%= f.select :qbo_customer_id, QboCustomer.all.pluck(:name, :id).sort, :selected => @selected_customer, include_blank: true %>
-      </div>
-      
-      <br/>
-      
-      <div>
-        <%= f.label "Item Count: "+@qbo_item_count.to_s %>
-        <br/>
-        <%= f.select :qbo_item_id, QboItem.all.pluck(:name, :id).sort.reverse, :selected => @selected_item, include_blank: true %>
-      </div>
-      
-      <br/>
-      
-      <div>
-        <%= f.label "Employee Count: "+@qbo_employee_count.to_s %>
-        <br/>
-        <%= f.select :qbo_employee_id, QboEmployee.all.pluck(:name, :id).sort, :selected => @selected_employee, include_blank: true %>
-      </div>
-    
-    
-      <p>
-        <%= f.label "Invoice Count: "+@qbo_invoice_count.to_s %>
-        <br/>
-        <%=f.select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => @selected_invoice, include_blank: true%>
-      </p> 
-      <p>
-        <%= f.label "Estimate Count: "+@qbo_estimate_count.to_s %>
-        <br/>
-        <%=f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => @selected_estimate, include_blank: true%>
-       </p>
-    
-      
-    <% end %>    
-    <br/>
-    <br/>
-    <%= link_to "Sync", qbo_sync_path %>
-</body>

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

@@ -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:
 
@@ -10,8 +10,4 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 -->
 
-<body>
-
-    <h2>QboController#sync</h2>
-
-</body>
+<h2>QboController#webhook</h2>

assets/javascripts/application.js

@@ -0,0 +1,11 @@
+$(function() {
+  $("input#issue_customer_id").on("change", function() {
+    
+    $.ajax({
+      url: "/filter_estimates_by_customer",
+      type: "GET",
+      data: { selected_customer: $("input#issue_customer_id").val() }
+    });
+  });
+    
+});

assets/javascripts/autocomplete-rails.js

@@ -0,0 +1 @@
+!function(t){t.fn.railsAutocomplete=function(e){var a=function(){this.railsAutoCompleter||(this.railsAutoCompleter=new t.railsAutocomplete(this))};if(void 0!==t.fn.on){if(!e)return;return t(document).on("focus",e,a)}return this.live("focus",a)},t.railsAutocomplete=function(t){var e=t;this.init(e)},t.railsAutocomplete.options={showNoMatches:!0,noMatchesLabel:"no existing match"},t.railsAutocomplete.fn=t.railsAutocomplete.prototype={railsAutocomplete:"0.0.1"},t.railsAutocomplete.fn.extend=t.railsAutocomplete.extend=t.extend,t.railsAutocomplete.fn.extend({init:function(e){function a(t){return t.split(e.delimiter)}function i(t){return a(t).pop().replace(/^\s+/,"")}e.delimiter=t(e).attr("data-delimiter")||null,e.min_length=t(e).attr("data-min-length")||t(e).attr("min-length")||2,e.append_to=t(e).attr("data-append-to")||null,e.autoFocus=t(e).attr("data-auto-focus")||!1,t(e).autocomplete({appendTo:e.append_to,autoFocus:e.autoFocus,delay:t(e).attr("delay")||0,source:function(a,r){var n=this.element[0],o={term:i(a.term)};t(e).attr("data-autocomplete-fields")&&t.each(t.parseJSON(t(e).attr("data-autocomplete-fields")),function(e,a){o[e]=t(a).val()}),t.getJSON(t(e).attr("data-autocomplete"),o,function(){var a={};t.extend(a,t.railsAutocomplete.options),t.each(a,function(i,r){if(a.hasOwnProperty(i)){var n=t(e).attr("data-"+i);a[i]=n?n:r}}),0==arguments[0].length&&t.inArray(a.showNoMatches,[!0,"true"])>=0&&(arguments[0]=[],arguments[0][0]={id:"",label:a.noMatchesLabel}),t(arguments[0]).each(function(a,i){var r={};r[i.id]=i,t(e).data(r)}),r.apply(null,arguments),t(n).trigger("railsAutocomplete.source",arguments)})},change:function(e,a){if(t(this).is("[data-id-element]")&&""!==t(t(this).attr("data-id-element")).val()&&(t(t(this).attr("data-id-element")).val(a.item?a.item.id:"").trigger("change"),t(this).attr("data-update-elements"))){var i=t.parseJSON(t(this).attr("data-update-elements")),r=a.item?t(this).data(a.item.id.toString()):{};if(i&&""===t(i.id).val())return;for(var n in i){var o=t(i[n]);o.is(":checkbox")?null!=r[n]&&o.prop("checked",r[n]):o.val(a.item?r[n]:"").trigger("change")}}},search:function(){var t=i(this.value);return t.length<e.min_length?!1:void 0},focus:function(){return!1},select:function(i,r){if(r.item.value=r.item.value.toString(),-1!=r.item.value.toLowerCase().indexOf("no match")||-1!=r.item.value.toLowerCase().indexOf("too many results"))return t(this).trigger("railsAutocomplete.noMatch",r),!1;var n=a(this.value);if(n.pop(),n.push(r.item.value),null!=e.delimiter)n.push(""),this.value=n.join(e.delimiter);else if(this.value=n.join(""),t(this).attr("data-id-element")&&t(t(this).attr("data-id-element")).val(r.item.id).trigger("change"),t(this).attr("data-update-elements")){var o=r.item,l=-1!=r.item.value.indexOf("Create New")?!0:!1,u=t.parseJSON(t(this).attr("data-update-elements"));for(var s in u)"checkbox"===t(u[s]).attr("type")?o[s]===!0||1===o[s]?t(u[s]).attr("checked","checked"):t(u[s]).removeAttr("checked"):l&&o[s]&&-1==o[s].indexOf("Create New")||!l?t(u[s]).val(o[s]).trigger("change"):t(u[s]).val("").trigger("change")}var c=this.value;return t(this).bind("keyup.clearId",function(){t.trim(t(this).val())!=t.trim(c)&&(t(t(this).attr("data-id-element")).val("").trigger("change"),t(this).unbind("keyup.clearId"))}),t(e).trigger("railsAutocomplete.select",r),!1}}),t(e).trigger("railsAutocomplete.init")}}),t(document).ready(function(){t("input[data-autocomplete]").railsAutocomplete("input[data-autocomplete]")})}(jQuery);

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) 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:
 #
@@ -9,10 +9,82 @@
 #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.
 
 # English strings go here for Rails i18n
+# Usage I18n.t(:label)
 en:
-  # my_label: "My label"
-  field_qbo_customer: "Customer"
-  field_qbo_item: "Item"
-  field_qbo_employee: "Employee"
-  field_qbo_invoice: "Invoice"
-  field_qbo_estimate: "Estimate" 
+  field_customer: "Customer"
+  field_item: "Item"
+  field_employee: "Employee"
+  field_invoice: "Invoice"
+  field_estimate: "Estimate" 
+  field_notes: "Notes"
+  field_billed: "Billed"
+  label_week: "Week"
+  label_search_estimates: "Search Estimates"
+  label_search: "Search"
+  label_estimates: "Estimates"
+  warn_ru_sure: "You sure?"
+  label_delete: "Delete"
+  label_edit: "Edit"
+  label_year: "Year"
+  label_make: " Make"
+  label_model: "Model"
+  label_no_customers: "There are no customers containing the term(s)"
+  label_matching: "Matching "
+  label_open_issues: "Open Issues"
+  label_closed_issues: "Closed Issues"
+  label_sync: "Sync"
+  label_new_customer: "New Customer"
+  label_search_customers: "Search Customers"
+  label_customers: "Customers"
+  label_edit_customer: "Edit Customer"
+  label_email: "Email"
+  label_primary_phone: "Primary Phone"
+  label_mobile_phone: "Mobile Phone"
+  label_billing_address: "Billing Address"
+  label_shipping_address: "Shipping Address"
+  label_account_balance: "Account Balance"
+  label_balance_with_jobs: "Balance With Jobs"
+  label_display_name: "Display Name"
+  label_details: "Details"
+  label_customer_link_expires: "This customer link expires in"
+  label_amount: "Amount"
+  label_deposit_into: "Deposit to Account"
+  label_last_sync: "Last Sync"
+  label_redmine_qbo: "Redmine Quickbooks"
+  label_customer_count: "Customer Count"
+  label_invoice_count: "Invoice Count"
+  label_estimate_count: "Estimate Count"
+  label_item_count: "Item Count"
+  label_employee_count: "Employee Count"
+  label_client_id: "Intuit QBO OAuth2 Client ID"
+  label_client_secret: "Intuit QBO OAuth2 Client Secret"
+  label_webhook_token: "Intuit QBO Webhook Token"
+  label_oauth_expires: "OAuth2 Access Token Expires At"
+  label_oauth_note: "Note: You need to authenticate with Quickbooks after saving your key and secret above"
+  field_customers: "Customers"
+  label_no_estimates: "No Estimates"
+  label_no_invoices: "No Invoices"
+  label_invoices: "Invoices"
+  label_load_customer: "Load Customer"
+  label_door: "Door"
+  label_trim: "Trim"
+  label_bill_time: "Bill Time"
+  label_share: "Share"
+  label_sync_now: "Sync Now"
+  label_invoice_404: "Invoice not found"
+  label_estimate_404: "Estimate not found"
+  label_connected: "Successfully connected to Quickbooks"
+  label_error: "Error"
+  label_billed_success: "Successfully Billed "
+  label_billing_error: "Cannot bill without a customer assigned"
+  label_qbo_sync_success: "Successfully synced to Quickbooks"
+  label_hours: "Hours"
+  label_oauth2_refresh_token_expires_at: "Refresh Token Expires At"
+  label_name: "Name"
+  label_appointment: "Add Appointment"
+  label_actions: "Actions"
+  label_create_estimate: "Create Estimate"
+  label_syncing: "Syncing Quickbooks"
+  label_sandbox: "Sandbox"
+  button_bulk_pdf: "Bulk PDF"
+  label_select_all: "Select All"

config/routes.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:
 #
@@ -8,12 +8,32 @@
 #
 #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.
 
-# Plugin's routes
-# See: http://guides.rubyonrails.org/routing.html
-#
-get 'qbo', :to=> 'qbo#index'
+#authentication
 get 'qbo/authenticate', :to => 'qbo#authenticate'
 get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
+
+#manual sync
 get 'qbo/sync', :to => 'qbo#sync'
-get 'qbo/estimate/:id', :to => 'estimate#show', as: :estimate
-get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
+
+#webhook
+post 'qbo/webhook', :to => 'qbo#webhook'
+
+# Estimate & Invoice PDF
+get 'estimates/:id', :to => 'estimate#show', as: :estimate
+get 'estimates/doc/', :to => 'estimate#doc', as: :estimate_doc
+get 'invoices/:id', :to => 'invoice#show', as: :invoice
+
+#manual billing
+get 'bill/:id', :to => 'qbo#bill', as: :bill
+
+#customer issue view
+get 'customers/view/:token', :to => 'customers#view', as: :view
+get 'customers/share/:id', :to => 'customers#share', as: :share
+
+#java script routes
+get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
+get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
+
+resources :customers do
+  get :autocomplete_customer_name, :on => :collection
+end

db/migrate/001_create_qbos.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:
 #
@@ -8,7 +8,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 CreateQbos < ActiveRecord::Migration
+class CreateQbos < ActiveRecord::Migration[5.1]
   
   def change
     create_table :qbos do |t|

db/migrate/002_create_qbo_customers.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:
 #
@@ -8,7 +8,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 CreateQboCustomers < ActiveRecord::Migration
+class CreateQboCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_customers, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/003_update_issues.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:
 #
@@ -8,7 +8,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 UpdateIssues < ActiveRecord::Migration
+class UpdateIssues < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_customer, index: true
     add_reference :issues, :qbo_item, index: true

db/migrate/004_create_qbo_items.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:
 #
@@ -8,7 +8,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 CreateQboItems < ActiveRecord::Migration
+class CreateQboItems < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_items, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/005_create_qbo_employees.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:
 #
@@ -8,7 +8,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 CreateQboEmployees < ActiveRecord::Migration
+class CreateQboEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_employees, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/006_update_users.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:
 #
@@ -8,7 +8,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 UpdateUsers < ActiveRecord::Migration
+class UpdateUsers < ActiveRecord::Migration[5.1]
   def change
     add_reference :users, :qbo_employee, index: true
   end

db/migrate/007_update_time_entries.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:
 #
@@ -8,7 +8,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 UpdateTimeEntries < ActiveRecord::Migration
+class UpdateTimeEntries < ActiveRecord::Migration[5.1]
   def change
     add_column :time_entries, :qbo_billed, :boolean, :default => false
   end

db/migrate/008_create_qbo_estimates.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:
 #
@@ -8,7 +8,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 CreateQboEstimates < ActiveRecord::Migration
+class CreateQboEstimates < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_estimates, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/009_update_qbos.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:
 #
@@ -8,7 +8,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 UpdateQbos < ActiveRecord::Migration
+class UpdateQbos < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbos, :token, :qb_token
     rename_column :qbos, :secret, :qb_secret

db/migrate/010_update_issues_with_estimates.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:
 #
@@ -8,7 +8,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 UpdateIssuesWithEstimates < ActiveRecord::Migration
+class UpdateIssuesWithEstimates < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_estimate, index: true
   end

db/migrate/011_create_qbo_invoices.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:
 #
@@ -8,7 +8,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 CreateQboInvoices < ActiveRecord::Migration
+class CreateQboInvoices < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_invoices, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/012_update_issues_with_invoices.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:
 #
@@ -8,7 +8,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 UpdateIssuesWithInvoices< ActiveRecord::Migration
+class UpdateIssuesWithInvoices< ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_invoice, index: true
   end

db/migrate/013_create_qbo_purchases.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:
 #
@@ -8,7 +8,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 CreateQboPurchases< ActiveRecord::Migration
+class CreateQboPurchases< ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_purchases, id: false do |t| 
       t.integer :id, :options => 'PRIMARY KEY' 

db/migrate/014_update_customers.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:
 #
@@ -8,7 +8,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 UpdateCustomers < ActiveRecord::Migration
+class UpdateCustomers < ActiveRecord::Migration[5.1]
   def change
     add_reference :qbo_customers, :qbo_purchase, index: true
   end

db/migrate/015_update_qbo_purchases.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:
 #
@@ -8,7 +8,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 UpdateQboPurchases < ActiveRecord::Migration
+class UpdateQboPurchases < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbo_purchases, :customer_id, :qbo_customer_id
   end

db/migrate/019_qbocustomers_to_customers.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:
 #
@@ -8,11 +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.
 
-module QboHelper
-
-  def qbo_customer_dropdown
-    select = context[:form].select :qbo_customer_id, QboCustomers.all.pluck(:name, :id), :selected => selected, include_blank: true
-    return "<p>#{select}</p>"
+class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
+  def change
+    rename_table :qbo_customers, :customers
+    rename_column :issues, :qbo_customer_id, :customer_id
   end 
-
 end

db/migrate/020_update_qbos_time_stamp.rb

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

db/migrate/021_add_issues_qbo_invoices.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:
 #
@@ -8,18 +8,20 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UsersShowHookListener < Redmine::Hook::ViewListener
+class AddIssuesQboInvoices < ActiveRecord::Migration[5.1]
+  def self.up
+    create_table :issues_qbo_invoices, :id => false do |t|
+      t.references :issue
+      t.references :qbo_invoice
+    end
     
-  # View User
-  def view_users_form(context={})
+    add_index :issues_qbo_invoices, [:issue_id, :qbo_invoice_id], :unique => true
     
-    # Update the users
-    QboEmployee.update_all
+    # Now populate it with a SQL one-liner!
+    execute "insert into issues_qbo_invoices(issue_id, qbo_invoice_id) select id, qbo_invoice_id from issues"
+  end
 
-    # Check to see if there is a quickbooks user attached to the issue
-    @selected = context[:user].qbo_employee.id if context[:user].qbo_employee
-
-    # Generate the drop down list of quickbooks contacts
-    return "<p>#{context[:form].select :qbo_employee_id, QboEmployee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
+  def self.down
+    drop_table :issues_qbo_invoices
   end
 end

db/migrate/022_update_issues_remove_invoice.rb

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

db/migrate/023_create_customer_tokens.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:
 #
@@ -8,30 +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.
 
-class QboItem < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  attr_accessible :name
-  validates_presence_of :id, :name
-  
-  def self.get_base
-    Qbo.get_base(:item)
+class CreateCustomerTokens < ActiveRecord::Migration[5.1]
+  def change
+    create_table :customer_tokens do |t|
+      t.string :token
+      t.timestamp :expires_at
+      t.references :issue
     end
-  
-  def self.update_all 
-    items = get_base.service.find_by(:type, "Service")
-        
-    transaction do
-      # Update the item table
-      items.each { |item|
-        qbo_item = QboItem.find_or_create_by(id: item.id)
-        qbo_item.name = item.name
-        qbo_item.id = item.id
-        qbo_item.save!
-      }
-    end
-    
-    #remove deleted items
-    where.not(items.map(&:id)).destroy_all
   end
 end

db/migrate/024_update_invoices_and_estimates.rb

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

db/migrate/026_create_line_items.rb

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

db/migrate/027_add_customers_phone_number.rb

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

db/migrate/028_add_customers_mobile_phone_number.rb

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

db/migrate/029_update_qbos_types.rb

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

db/migrate/030_update_qbos_token.rb

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

db/migrate/031_remove_qbos_keys.rb

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

db/migrate/032_add_txn_dates.rb

@@ -0,0 +1,55 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AddTxnDates < ActiveRecord::Migration[5.1]
+
+  def change
+    begin
+      add_column :qbo_invoices, :txn_date, :date
+      add_column :qbo_estimates, :txn_date, :date
+
+      reversible do |direction|
+        direction.up {
+          break unless Qbo.first
+
+          QboEstimate.reset_column_information
+          QboInvoice.reset_column_information
+
+          say "Sync Estimates"
+
+          QboEstimate.sync
+
+          say "Sync Invoices"
+
+          qbo = Qbo.first
+          invoices = qbo.perform_authenticated_request do |access_token|
+            service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+            service.all
+          end
+
+          return unless invoices
+
+          invoices.each { |invoice|
+              # Load the invoice into the database
+              qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+              qbo_invoice.doc_number = invoice.doc_number
+              qbo_invoice.id = invoice.id
+              qbo_invoice.customer_id = invoice.customer_ref
+              qbo_invoice.txn_date = invoice.txn_date
+              qbo_invoice.save!
+          }
+        }
+      end
+    rescue
+      logger.error "AddTxnDates Failed"
+    end
+  end
+
+end

db/migrate/034_remove_qbo_items.rb

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

db/migrate/035_drop_qbo_prefix.rb

@@ -0,0 +1,22 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 - 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class DropQboPrefix < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :qbo_invoices, :invoices
+    rename_table :qbo_estimates, :estimates
+    rename_table :qbo_employees, :employees
+    rename_table :issues_qbo_invoices, :invoices_issues
+    
+    rename_column :issues, :qbo_estimate_id, :estimate_id
+    rename_column :users, :qbo_employee_id, :employee_id
+    rename_column :invoices_issues, :qbo_invoice_id, :invoice_id
+  end 
+end

db/migrate/036_remove_qbo_time_entries.rb

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

db/migrate/037_update_qbo_token.rb

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

init.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:
 #
@@ -10,36 +10,40 @@
 
 Redmine::Plugin.register :redmine_qbo do
   
-  # View Hook Listeners
-   require_dependency 'issues_form_hook_listener'
-   require_dependency 'issues_save_hook_listener'
-   require_dependency 'issues_show_hook_listener'
-   require_dependency 'users_show_hook_listener'
-   
-   # Patches to the Redmine core.  Will not work in development mode
-    require_dependency 'issue_patch'
-    require_dependency 'user_patch'
-
-    name 'Redmine Quickbooks Online plugin'
+  # About
+  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 '0.0.4'
+  version '2026.1.3'
   url 'https://github.com/rickbarrette/redmine_qbo'
-    author_url 'http://rickbarrette.org'
+  author_url 'https://barrettefabrication.com'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'
+  requires_redmine :version_or_higher => '6.1.0'
   
-    # Add safe attributes
-    Issue.safe_attributes 'qbo_customer_id'
-    Issue.safe_attributes 'qbo_item_id'
-    Issue.safe_attributes 'qbo_estimate_id'
-    Issue.safe_attributes 'qbo_invoice_id'
-    User.safe_attributes 'qbo_employee_id'
-    TimeEntry.safe_attributes 'qbo_billed'
+  # Add safe attributes for core models
+  Issue.safe_attributes 'customer_id'
+  Issue.safe_attributes 'item_id'
+  Issue.safe_attributes 'estimate_id'
+  Issue.safe_attributes 'invoice_id'
+  User.safe_attributes 'employee_id'
+  TimeEntry.safe_attributes 'billed'
   
-    # We are playing in the sandbox 
-    #Quickbooks.sandbox_mode = true
+  # set per_page globally
+  WillPaginate.per_page = 20
 
-    # Register QBO top menu item
-    menu :top_menu, :qbo, { :controller => 'qbo', :action => 'index' }, :caption => 'Quickbooks'
+  # Permissions for security
+  permission :view_customers, :customers => :index, :public => false
+  permission :add_customers, :customers => :new, :public => false
+  
+  # Register top menu items
+  menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
     
 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

@@ -0,0 +1,19 @@
+#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 HeaderFooterHookListener < Redmine::Hook::ViewListener
+    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

@@ -0,0 +1,33 @@
+#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 IssuesSaveHookListener < Redmine::Hook::ViewListener
+
+    # Called Before Issue Saved
+    def controller_issues_edit_before_save(context={})
+      issue = context[:issue]
+      issue.subject = issue.subject.titleize
+    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
+
+end

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

@@ -0,0 +1,29 @@
+#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 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
+
+end

lib/hooks/view_hook_listener.rb

@@ -0,0 +1,19 @@
+#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 ViewHookListener < Redmine::Hook::ViewListener
+
+    render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
+    
+  end
+
+end

lib/hooks/view_layouts_hook_listener.rb

@@ -0,0 +1,25 @@
+#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 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
+
+end

lib/issues_form_hook_listener.rb

@@ -1,44 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 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
-
-  # Edit Issue Form
-  # Show a dropdown for quickbooks contacts
-  def view_issues_form_details_bottom(context={})
-    # Update the customer and item database
-    #QboCustomer.update_all
-    #QboItem.update_all
-    #QboInvoice.update_all
-    #QboEstimate.update_all
- 
-    # Check to see if there is a quickbooks user attached to the issue
-    @selected_customer =  context[:issue].qbo_customer ? context[:issue].qbo_customer.id  : nil
-    @selected_item = context[:issue].qbo_item ? context[:issue].qbo_item.id  : nil
-    @selected_invoice = context[:issue].qbo_invoice ? context[:issue].qbo_invoice.id  : nil
-    @selected_estimate =  context[:issue].qbo_estimate ? context[:issue].qbo_estimate.id  : nil
-    
-    # Generate the drop down list of quickbooks customers
-    @select_customer = context[:form].select :qbo_customer_id, QboCustomer.all.pluck(:name, :id).sort, :selected => selected_customer, include_blank: true
-  
-    # Generate the drop down list of quickbooks items
-    @select_item = context[:form].select :qbo_item_id, QboItem.all.pluck(:name, :id).sort, :selected => selected_item, include_blank: true
-    
-    # Generate the drop down list of quickbooks invoices
-    @select_invoice = context[:form].select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_invoice, include_blank: true
-    
-    # Generate the drop down list of quickbooks extimates
-    @select_estimate = context[:form].select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true
-    
-    #@estimates_link = link_to qbo_update_estimates_path
-    
-    return "<p>#{@select_customer}</p> <p>#{@select_item}</p> <p>#{@select_invoice}</p> <p>#{@select_estimate} #{@estimates_link}</p>"
-  end
-end