2.1.0 Bumped wrong versoin

This stuff isn't really used for anything

.gitignore

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

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'quickbooks-ruby'
-gem 'oauth2', '1.4.7'
+gem 'oauth2'
 gem 'roxml'
 gem 'nhtsa_vin'
 gem 'will_paginate'

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Rick Barrette
+Copyright (c) 2016 - 2024 Rick Barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,46 +2,51 @@
 
 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 loged when an Issue is closed.
 
 #### Disclaimer
 
-Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable
+Note: Although the core functionality is complete, this project is still under development & the master branch may be unstable. Tags should be stable and are recommended
 
-Use tags Version 1.0.0 & up for Redmine 4+ and Version 0.8.1 for Redine 3
+Use tags for the following Redmine Versions
+* Version 2.0.0+ for Redmine 5+
+* Version 1.0.0+ for Redmine 4+ 
+* Version 0.8.1 for Redine 3
 
 #### Features
-* Issues can be assigned to a `Customer` via drop down in the edit Issue form
+* Issues can be assigned to a Customer via drop down in the edit Issue form
-* The `Employee` for the Issue is assigned via the assigned Redmine User
+  - Once a customer is attached to an Issue, you can attach an Estimate to the issue via a drop down menu
-  - This is set via a drop down in the user admistration page.
+* Employee is assigned to a user via a drop down in the user admistration page.
-* IF an `Issue` has been assined a `Customer` when an Issue is closed the following will happen:
+* IF an Issue has been assined a Customer when an Issue is closed the following will happen:
-  - A new `Time Activity` will be billed agaist the `Customer` assinged to the issue for each Redmine Time Entery. 
+  - A new Time Activity will be billed agaist the Customer assinged to the issue for each Redmine Time Entery. 
     + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
-    + The Time Activity names are used to lookup `Items` in Quickbooks.
+    + The Time Activity names are used to dynamically lookup Items in Quickbooks.
-    + IF there isn'tany Items that match the Activity name it will be skipped, and will not be billed to the `Customer` 
+    + IF there isn't any Items that match the Activity name it will be skipped, and will not be billed to the Customer 
-  - Labor Rates are set by the `Item` in Quickbooks
+  - Labor Rates are set by corresponding the Item in Quickbooks
-* `Payments` Can be created via the Redmine application menu
+* Customers Can be created via the New Customer Page
-* `Customers` Can be created via the Redmine application menu
+  - Customers can be searched by name or phone number
-  - `Customers` can be searched
+  - Basic information for the Customer can be viewed/edit via the Customer page
-  - Basic information for the `Customer` can be viewed/edit via the Customer page
 * Webhook Support
-  - `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
+  - Invoices are automaticly attached to an Issue if a line item has a hashtag number in a Line Item
-    + `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
+    + Invoice Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
-  - `Customers` are automaticly updated in local database
+  - Customers are automaticly updated in local database
 
 ## Prerequisites
 
 * Sign up to become a developer for Intuit https://developer.intuit.com/
 * Create your own aplication to obtain your API keys
 * Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
-  - See https://developer.intuit.com/docs/0100_accounting/0300_developer_guides/webhooks
 
 ## The Install
 
-1. To install, clone this repo into your plugin folder
+1. To install, clone this repo into your plugin folder & checkout a tagged version
 
   `git clone git@github.com:rickbarrette/redmine_qbo.git` 
   
+  then
+  
+  `git checkout <tag>`
+  
 2. Migrate your database
 
   `rake redmine:plugins:migrate RAILS_ENV=production`
@@ -54,27 +59,20 @@ Use tags Version 1.0.0 & up for Redmine 4+ and Version 0.8.1 for Redine 3
 
 ## Usage
 
-  To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
+  To enable automatic Time Activity entries for an Issue , you need only to assign a Customer to an Issue via drop downs in the issue creation/update form.
 
 Note: After the inital synchronization, this plugin will recieve 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
-  * Customer Deletion
-  * Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue. 
   * Add Setting for Sandbox Mode
-  * Refactor Models prefixed with Qbo...
+  * Seperate Vehicles into a seperate plugin (I use redmine for my automotive shop management 😉)
-  * Seperate Vehicles into a seperate plugin
+  * MORE Stuff as I make it up...
-  * Make HTML Pretty 
-  * Intergrate Customer Search into Redmine Search
-  * Fix Issue sort by Customer
-  * MORE Stuff...
 
 ## License
 
 The MIT License (MIT)
 
-Copyright (c) 2022 rick barrette
+Copyright (c) 2016 - 2022 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app/controllers/customers_controller.rb

@@ -27,8 +27,8 @@ class CustomersController < ApplicationController
   include SortHelper
   helper :timelog
 
-  before_action  :add_customer, :only => :new
+  before_action :add_customer, :only => :new
-  before_action  :view_customer, :except => [:new, :view]
+  before_action :view_customer, :except => [:new, :view]
   skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
 
   default_search_scope :names
@@ -36,7 +36,7 @@ class CustomersController < ApplicationController
   autocomplete :customer, :name, :full => true, :extra_data => [:id]
 
   def allowed_params
-    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number)
+    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
   end
 
   # getter method for a customer's vehicles
@@ -48,13 +48,13 @@ class CustomersController < ApplicationController
   # getter method for a customer's invoices
   # used for customer autocomplete field / issue form
   def filter_invoices_by_customer
-    @filtered_invoices = QboInvoice.all.where(customer_id: params[:selected_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 = QboEstimate.all.where(customer_id: params[:selected_customer])
+    @filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
   end
 
   # display a list of all customers
@@ -93,7 +93,11 @@ class CustomersController < ApplicationController
       @billing_address = address_to_s(@customer.billing_address)
       @shipping_address = address_to_s(@customer.shipping_address)
       @closed_issues = (@issues - @issues.open)
-    rescue ActiveRecord::RecordNotFound
+      @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
@@ -102,7 +106,7 @@ class CustomersController < ApplicationController
   def edit
     begin
       @customer = Customer.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -111,14 +115,14 @@ class CustomersController < ApplicationController
   def update
     begin
       @customer = Customer.find_by_id(params[:id])
-      if @customer.update_attributes(allowed_params)
+      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 ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -129,25 +133,44 @@ class CustomersController < ApplicationController
       Customer.find_by_id(params[:id]).destroy
       flash[:notice] = "Customer deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    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.debug "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.where("token = ? and expires_at > ?", params[:token], Time.now)
+    @token = CustomerToken.find_by token: params[:token]
-    @token = @token.first
+    begin
-    if @token
+      @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(:details).
-                  preload(:user => :email_address).
+        preload(:user => :email_address).
-                  reorder(:created_on, :id).to_a
+        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)
@@ -162,7 +185,7 @@ class CustomersController < ApplicationController
       @priorities = IssuePriority.active
       @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
       @relation = IssueRelation.new
-    else
+    rescue
       render_403
     end
   end
@@ -195,14 +218,14 @@ class CustomersController < ApplicationController
   # format a quickbooks address to a human readable string
   def address_to_s (address)
     return if address.nil?
-    string =  address.line1
+    string = address.line1 if address.line1
     string << "\n" + address.line2 if address.line2
     string << "\n" + address.line3 if address.line3
     string << "\n" + address.line4 if address.line4
     string << "\n" + address.line5 if address.line5
-    string << " " + address.city
+    string << " " + address.city if address.city
-    string << ", " + address.country_sub_division_code
+    string << ", " + address.country_sub_division_code if address.country_sub_division_code
-    string << " " + address.postal_code
+    string << " " + address.postal_code if address.postal_code
     return string
   end
 

app/controllers/estimate_controller.rb

@@ -12,17 +12,23 @@ class EstimateController < ApplicationController
   
   include AuthHelper
   
-  before_action :require_user
+  before_action :require_user, :unless => proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+
+  def get_estimate
+    estimate = Estimate.find_by_id(params[:id]) if params[:id]
+    estimate = Estimate.find_by_doc_number(params[:search]) if params[:search]
+    return estimate
+  end
   
   #
   # Downloads and forwards the estimate pdf
   #
   def show
-    e = QboEstimate.find_by_id(params[:id]) if params[:id]
+    estimate = get_estimate
-    e = QboEstimate.find_by_doc_number(params[:search]) if params[:search]
 
     begin
-      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
     rescue
       redirect_to :back, :flash => { :error => "Estimate not found" }
     end
@@ -32,11 +38,10 @@ class EstimateController < ApplicationController
   # Downloads estimate by document number
   #
   def doc
-    e = QboEstimate.find_by_doc_number(params[:id]) if params[:id]
+    estimate = get_estimate
-    e = QboEstimate.find_by_doc_number(params[:search]) if params[:search]
     
     begin
-      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
     rescue
       redirect_to :back, :flash => { :error => "Estimate not found" }
     end

app/controllers/invoice_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -19,9 +19,16 @@ class InvoiceController < ApplicationController
   # Downloads and forwards the invoice pdf
   #
   def show
-    base = QboInvoice.get_base
+    begin
-    invoice = base.fetch_by_id(params[:id])
+      qbo = Qbo.first
-    @pdf = base.pdf(invoice)
+        qbo.perform_authenticated_request do |access_token|
-    send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        invoice = service.fetch_by_id(params[:id])
+        @pdf = service.pdf(invoice)
+        send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      end
+    rescue
+      redirect_to :back, :flash => { :error => "Invoice not found" }
+    end
   end
 end

app/controllers/line_items_controler.rb

@@ -1,94 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# This controller class will handle map management
-class LineItemsController < ApplicationController
-  unloadable
-  
-  include AuthHelper
-  
-  before_action :require_user
-  
-  # display all line items for an issue
-  def index
-    if params[:issue_id]
-      begin
-        @line_items = Issue.find_by_id(params[:issue_id]).line_items
-      rescue ActiveRecord::RecordNotFound
-        render_404
-      end
-    end
-  end
-
-  # return an HTML form for creating a new line item
-  def new
-    @line_item = LineItem.new
-  end
-
-  # create a new line item
-  def create
-    @line_item = LineItem.new(params[:line_item])
-    if @line_item.save
-      flash[:notice] = "New Line Item Created"
-      redirect_to @line_item.issue
-    else
-      flash[:error] = @line_item.errors.full_messages.to_sentence 
-      redirect_to new_line_item_path
-    end
-  end
-  
-  # display a specific line item
-  def show
-    begin
-      @line_item = LineItem.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-  
-  # return an HTML form for editing a line item
-  def edit
-    begin
-      @line_item = LineItem.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-  
-  # update a specific line item
-  def update
-    begin   
-      @line_item = LineItem.find_by_id(params[:id])
-      if @line_item.update_attributes(params[:line_item])
-        flash[:notice] = "Line Item updated"
-        redirect_to @line_item
-      else
-        flash[:error] = @line_item.errors.full_messages.to_sentence if @line_item.errors
-        redirect_to edit_line_item_path
-      end
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end  
-
-  # delete a specific line item
-  def destroy
-    begin
-      line_item = LineItem.find_by_id(params[:id])
-      issue = line_item.issue
-      line_item.destroy
-      flash[:notice] = "Line Item deleted successfully"
-      redirect_to issue
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-
-end

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -15,33 +15,21 @@ class QboController < ApplicationController
   
   include AuthHelper
   
-  before_action :require_user, :except => :qbo_webhook
+  before_action :require_user, :except => :webhook
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:qbo_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 QBO Top Menu us shown
-  #
-  def index
-    @qbo = Qbo.first
-    @customer_count = Customer.count
-    @qbo_item_count = QboItem.count
-    @qbo_employee_count = QboEmployee.count
-    @qbo_invoice_count = QboInvoice.count
-    @qbo_estimate_count = QboEstimate.count
-  end
-
   #
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
-    oauth2_client = Qbo.get_client
+    redirect_uri = "https://" + Setting.host_name + qbo_oauth_callback_path
-    callback = Setting.host_name + "/qbo/oauth_callback/" 
+    logger.info "redirect_uri: " + redirect_uri
-    #callback = qbo_oauth_callback_url
+    oauth2_client = Qbo.construct_oauth2_client
-    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
+    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
   
@@ -50,10 +38,9 @@ class QboController < ApplicationController
   #
   def oauth_callback
     if params[:state].present?
-      oauth2_client = Qbo.get_client
+      oauth2_client = Qbo.construct_oauth2_client
       # use the state value to retrieve from your backend any information you need to identify the customer in your system
-      #redirect_uri = qbo_oauth_callback_url
+      redirect_uri = "https://" + Setting.host_name + qbo_oauth_callback_path
-      redirect_uri = Setting.host_name + "/qbo/oauth_callback/"
       if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
         
         # Remove the last authentication information
@@ -61,12 +48,8 @@ class QboController < ApplicationController
         
         # Save the authentication information 
         qbo = Qbo.new
-        qbo.company_id = params[:realmId]
+        qbo.update(oauth2_access_token: resp.token, oauth2_refresh_token: resp.refresh_token, realm_id: params[:realmId])
-        
+        qbo.refresh_token!
-        # Generate Access Token & Serialize it into the database
-        access_token = OAuth2::AccessToken.new(oauth2_client, resp.token, refresh_token: resp.refresh_token)
-        qbo.token = access_token.to_hash
-        qbo.expire = 1.hour.from_now.utc
         
         if qbo.save!
           redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
@@ -90,7 +73,7 @@ class QboController < ApplicationController
   end
   
   # Quickbooks Webhook Callback
-  def qbo_webhook
+  def webhook
 
     logger.info "Quickbooks is calling webhook"
     
@@ -113,9 +96,6 @@ class QboController < ApplicationController
       entities.each do |entity|
         id = entity['id'].to_i
         name = entity['name']
-        
-        # TODO rename all other models!
-        name.prepend("Qbo") if not name.eql? "Customer"
        
         logger.debug "Casting #{name.constantize} to obj"
 
@@ -144,7 +124,7 @@ class QboController < ApplicationController
       Qbo.update_time_stamp
       
       # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true
+      render :nothing => true, status: 200
     else
       render nothing: true, status: 400
     end
@@ -161,10 +141,9 @@ class QboController < ApplicationController
     Thread.new do
       if Qbo.exists?
         Customer.sync
-        QboInvoice.sync
+        Invoice.sync
-        QboItem.sync
+        Employee.sync
-        QboEmployee.sync
+        Estimate.sync
-        QboEstimate.sync
         
         # Record the last sync time
         Qbo.update_time_stamp
@@ -172,6 +151,6 @@ class QboController < ApplicationController
       ActiveRecord::Base.connection.close
     end
 
-    redirect_to :home, :flash => { :notice => "Successfully synced to Quickbooks" }
+    redirect_to :home, :flash => { :notice => "Syncing Quickbooks" }
   end
 end

app/controllers/vehicles_controller.rb

@@ -64,7 +64,7 @@ class VehiclesController < ApplicationController
       @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
       @issues = @vehicle.issues.order(id: :desc)
       @closed_issues = (@issues - @issues.open)
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -74,7 +74,7 @@ class VehiclesController < ApplicationController
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
       @customer = @vehicle.customer
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -84,7 +84,7 @@ class VehiclesController < ApplicationController
     @customer = params[:customer]
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(allowed_params)
+      if @vehicle.update(allowed_params)
         flash[:notice] = "Vehicle updated"
         redirect_to @vehicle
       else
@@ -92,7 +92,7 @@ class VehiclesController < ApplicationController
       end
       #show any errors anyways
       flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -103,14 +103,14 @@ class VehiclesController < ApplicationController
       Vehicle.find_by_id(params[:id]).destroy
       flash[:notice] = "Vehicle deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
 
   private
 
-  # checks to see if there is only one item  in an array
+  # 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
@@ -123,4 +123,4 @@ class VehiclesController < ApplicationController
     found_non_zero
   end
 
-end
+end

app/helpers/auth_helper.rb

@@ -13,7 +13,7 @@ module AuthHelper
   def require_user
     return unless session[:token].nil?
     if !User.current.logged?
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true
+      render_403
     end
   end
   
@@ -27,14 +27,14 @@ module AuthHelper
   
   def check_permission(permission)
     if !allowed_to?(permission)
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+      render_403
     end
   end
   
   
   def global_check_permission(permission)
     if !globaly_allowed_to?(permission)
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+      render_403
     end
   end
   

app/models/concerns/quickbooks_oauth.rb

@@ -0,0 +1,80 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2023 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module QuickbooksOauth
+  extend ActiveSupport::Concern
+
+  OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+
+  #== Instance Methods
+
+  def perform_authenticated_request(&block)
+    attempts = 0
+    begin
+      yield oauth_access_token
+    rescue OAuth2::Error, Quickbooks::AuthorizationFailure => ex
+      Rails.logger.info("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!
+    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
+
+    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
+      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

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,19 +12,18 @@ class Customer < ActiveRecord::Base
   unloadable
   
   has_many :issues
-  has_many :qbo_purchases
+  has_many :purchases
-  has_many :qbo_invoices
+  has_many :invoices
-  has_many :qbo_estimates
+  has_many :estimates
   has_many :vehicles
   
-  #attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone, :phone_number
   validates_presence_of :id, :name
   
   self.primary_key = :id
   
   # returns a human readable string
   def to_s
-    return name
+    return "#{self[:name]} - #{phone_number.split(//).last(4).join unless phone_number.nil?}"
   end
   
   # Convenience Method
@@ -88,6 +87,13 @@ class Customer < ActiveRecord::Base
     #update our locally stored number too
     update_mobile_phone_number
   end
+
+  # Convenience Method
+  # Sets the notes
+  def notes=(s)
+    pull unless @details
+    @details.notes = s
+  end
   
   # update the localy stored phone number as a plain string with no special chars
   def update_phone_number
@@ -117,48 +123,48 @@ class Customer < ActiveRecord::Base
   
   # Magic Method
   # Maps Get/Set methods to QBO customer object
-  def method_missing(sym, *arguments)  
+  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] == "="  
+      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])  
+        @details.method(method_name).call(arguments[0])
       # Getter
-      else  
+      else
         return @details.method(method_name).call 
       end
-    end  
+    end
-  end  
+  end
   
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync 
-    service = Qbo.get_base(:customer)
-
     # Sync ALL customers if the database is empty
-    #if count == 0
+    qbo = Qbo.first
-      customers = service.all
+    customers = qbo.perform_authenticated_request do |access_token|
-    #else
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-    #  last = Qbo.first.last_sync
+      service.all
-    #  query = "Select Id, DisplayName From Customer"
+    end
-    #  query << " Where Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
-    #  customers = service.query(query)
-    #end
     
-    customers.each do |customer|
+    return unless customers
-      qbo_customer = Customer.find_or_create_by(id: customer.id)
+    
-      if customer.active?
+    customers.each do |c|
-        if not qbo_customer.name.eql? customer.display_name
+      logger.info "Processing customer #{c.id}"
-          qbo_customer.name = customer.display_name
+      customer = Customer.find_or_create_by(id: c.id)
-          qbo_customer.id = customer.id
+      if c.active?
-          qbo_customer.save_without_push
+        #if not customer.name.eql? c.display_name
-        end
+          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 qbo_customer.new_record?
+        if not c.new_record?
-          qbo_customer.delete
+          customer.delete
         end
       end
     end
@@ -173,19 +179,26 @@ class Customer < ActiveRecord::Base
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync_by_id(id) 
-    service = Qbo.get_base(:customer)
+    qbo = Qbo.first
+    c = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
 
-    customer = service.fetch_by_id(id)
+    return unless c
-    qbo_customer = Customer.find_or_create_by(id: customer.id)
+
-    if customer.active?
+    customer = Customer.find_or_create_by(id: c.id)
-      if not qbo_customer.name.eql? customer.display_name
+    if c.active?
-        qbo_customer.name = customer.display_name
+      #if not customer.name.eql? c.display_name
-        qbo_customer.id = customer.id
+        customer.name = c.display_name
-        qbo_customer.save_without_push
+        customer.id = c.id
-      end
+        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 qbo_customer.new_record?
+      if not customer.new_record?
-        qbo_customer.delete
+        customer.delete
       end
     end
   end
@@ -193,7 +206,11 @@ class Customer < ActiveRecord::Base
   # Push the updates
   def save_with_push
     begin
-      @details = Qbo.get_base(:customer).update(@details)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.update(@details)
+      end
       #raise "QBO Fault" if @details.fault?
       self.id = @details.id
     rescue Exception => e
@@ -211,7 +228,11 @@ class Customer < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:customer).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Customer.new
     end

app/models/customer_token.rb

@@ -11,13 +11,51 @@
 class CustomerToken < ActiveRecord::Base
   unloadable
   has_many :issues
-  #attr_accessible :token, :expires_at, :issue_id
+  validates_presence_of :issue_id
-  validates_presence_of :expires_at, :issue_id
+  before_create :generate_token, :generate_expire_date
-  before_create :generate_token
+  attr_accessor :destroyed
+  after_destroy :mark_as_destroyed
 
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE_QBO__' + SecureRandom.uuid
+  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,57 +1,50 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-class PaymentsController < ApplicationController
+
+class Employee < ActiveRecord::Base
   unloadable
+  has_many :users
+  validates_presence_of :id, :name
   
-  include AuthHelper
+  def self.sync 
-  
+    qbo = Qbo.first
-  before_action :check_permissions
+    employees = qbo.perform_authenticated_request do |access_token|
-  
+      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
-  def new
+      service.all
-    @payment = Payment.new
-    
-    @customers = Customer.all.sort_by &:name
-    
-    @accounts = Qbo.get_base(:account).query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' Order By Name")
-    
-    @payment_methods = Qbo.get_base(:payment_method).all
-  end
-  
-  def create
-    @payment = Payment.new(params[:payment])
-    if @payment.save
-      flash[:notice] = "Payment Saved"
-      redirect_to Customer.find_by_id(@payment.customer_id)
-    else
-      flash[:error] = @payment.errors.full_messages.to_sentence 
-      redirect_to new_customer_path
     end
-  end
-  
-  private
 
-  def check_permissions
+    return unless employees
-    if !allowed_to?(:add_payments)
+    
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+    transaction do
+      # 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
-  
-  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
 
+  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

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,24 +8,25 @@
 #
 #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
+class Estimate < ActiveRecord::Base
   unloadable
   
   has_and_belongs_to_many :issues
   belongs_to :customer 
-  #attr_accessible :doc_number, :id
   validates_presence_of :doc_number, :id
   self.primary_key = :id
   
-  # return the QBO Estimate service
-  def self.get_base
-    Qbo.get_base(:estimate)
-  end
-  
   # sync all estimates
   def self.sync
     logger.debug "Syncing ALL estimates"
-    estimates = get_base.all
+    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)
     }
@@ -37,53 +38,67 @@ class QboEstimate < ActiveRecord::Base
   # sync only one estimate
   def self.sync_by_id(id)
     logger.debug "Syncing estimate #{id}"
-    process_estimate(get_base.fetch_by_id(id))
+    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
   
   # update an estimate
   def self.update(id)
     # Update the item table
-    estimate = get_base.fetch_by_id(id)
+    qbo = Qbo.first
-    qbo_estimate = find_or_create_by(id: id)
+    estimate = qbo.perform_authenticated_request do |access_token|
-    qbo_estimate.doc_number = estimate.doc_number
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-    qbo_estimate.txn_date = estimate.txn_date
+      service.fetch_by_id(id)
-    qbo_estimate.save!
+    end
+
+    return unless estimate
+
+    e = find_or_create_by(id: id)
+    e.doc_number = estimate.doc_number
+    e.txn_date = estimate.txn_date
+    e.save!
   end
   
   # process an estimate into the database
-  def self.process_estimate(estimate)
+  def self.process_estimate(qbo_estimate)
-    logger.info "Processing estimate #{estimate.id}"
+    logger.info "Processing estimate #{qbo_estimate.id}"
-    qbo_estimate = find_or_create_by(id: estimate.id)
+    estimate = find_or_create_by(id: qbo_estimate.id)
-    qbo_estimate.doc_number = estimate.doc_number
+    estimate.doc_number = qbo_estimate.doc_number
-    qbo_estimate.customer_id = estimate.customer_ref.value
+    estimate.customer_id = qbo_estimate.customer_ref.value
-    qbo_estimate.id = estimate.id
+    estimate.id = qbo_estimate.id
-    qbo_estimate.txn_date = estimate.txn_date
+    estimate.txn_date = qbo_estimate.txn_date
-    qbo_estimate.save!
+    estimate.save!
   end
 
   # download the pdf from quickbooks
   def pdf
-    base = QboEstimate.get_base
+    qbo = Qbo.first
-    estimate = base.fetch_by_id(id)
+    qbo.perform_authenticated_request do |access_token|
-    return base.pdf(estimate)
+      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)  
+  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] == "="  
+      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])  
+        @details.method(method_name).call(arguments[0])
       # Getter
-      else  
+      else
         return @details.method(method_name).call 
       end
-    end  
+    end
   end
 
   private
@@ -92,7 +107,11 @@ class QboEstimate < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:estimate).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service(:estimate).fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Estimate.new
     end

app/models/invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,33 +8,30 @@
 #
 #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
+class Invoice < ActiveRecord::Base
   unloadable
   has_and_belongs_to_many :issues
   belongs_to :customer 
   validates_presence_of :doc_number, :id, :customer_id, :txn_date
   self.primary_key = :id
   
-  # Get the quickbooks-ruby base for invoice
-  def self.get_base
-    Qbo.get_base(:invoice)
-  end
-  
   # sync ALL the invoices
   def self.sync
     logger.debug "Syncing all invoices"
     last = Qbo.first.last_sync
 
     query = "SELECT Id, DocNumber FROM Invoice"
-    query << " WHERE  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
+    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
-    if count == 0
+    qbo = Qbo.first
-      invoices = get_base.all 
+    invoices = qbo.perform_authenticated_request do |access_token|
-    else
+      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-      invoices = get_base.query()
+      service.all 
     end
+
+    return unless invoices
      
     invoices.each { | invoice | 
       process_invoice invoice
@@ -44,8 +41,12 @@ class QboInvoice < ActiveRecord::Base
   #sync by invoice ID
   def self.sync_by_id(id)
     logger.debug "Syncing invoice #{id}"
-    invoice = get_base.fetch_by_id(id) 
+    qbo = Qbo.first
-    process_invoice invoice
+    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
@@ -59,10 +60,10 @@ class QboInvoice < ActiveRecord::Base
     
     logger.debug "Attaching invoice #{invoice.id} to issue #{issue.id}"
     
-    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+    invoice = Invoice.find_or_create_by(id: invoice.id)
 
-    unless issue.qbo_invoices.include?(qbo_invoice)
+    unless issue.invoices.include?(invoice)
-      issue.qbo_invoices << qbo_invoice
+      issue.invoices << invoice
       issue.save!
     end
     
@@ -70,26 +71,26 @@ class QboInvoice < ActiveRecord::Base
   end
   
   # processes the invoice into the database
-  def self.process_invoice(invoice)
+  def self.process_invoice(i)
-    logger.info "Processing invoice #{invoice.id}"
+    logger.info "Processing invoice #{i.id}"
 
     # Load the invoice into the database
-    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+    invoice = Invoice.find_or_create_by(id: i.id)
-    qbo_invoice.doc_number = invoice.doc_number 
+    invoice.doc_number = i.doc_number 
-    qbo_invoice.id = invoice.id
+    invoice.id = i.id
-    qbo_invoice.customer_id = invoice.customer_ref
+    invoice.customer_id = i.customer_ref
-    qbo_invoice.txn_date = invoice.txn_date
+    invoice.txn_date = i.txn_date
-    qbo_invoice.save!
+    invoice.save!
 
-    # Scan the private notes  for hashtags and attach to the applicable issues
+    # Scan the private notes for hashtags and attach to the applicable issues
-    if not invoice.private_note.nil?
+    if not i.private_note.nil?
-      invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
+      i.private_note.scan(/#(\w+)/).flatten.each { |issue|
         attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
       }
     end
     
     # Scan the line items for hashtags and attach to the applicable issues
-    invoice.line_items.each { |line|
+    i.line_items.each { |line|
       if line.description
         line.description.scan(/#(\w+)/).flatten.each { |issue|
           attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
@@ -105,7 +106,7 @@ class QboInvoice < ActiveRecord::Base
   # TODO maybe add a cf_sync_confict flag to invoices
   def self.compare_custom_fields(issue, invoice)
     logger.debug "Comparing custom fields"
-    # TODO break if QboInvoice.find(invoice.id).cf_sync_confict
+    # TODO break if Invoice.find(invoice.id).cf_sync_confict
     is_changed = false
     
     # update the invoive custom fields with infomation from the issue if available
@@ -155,39 +156,47 @@ class QboInvoice < ActiveRecord::Base
     # Push updates
     begin
       logger.debug "Trying to update invoice"
-      get_base.update(invoice) if is_changed
+      qbo = Qbo.first
+      qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.update(invoice) if is_changed
+      end
     rescue
-      # Do nothing, probaly custome field  sync confict on the invoice. 
+      # 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 QboInvoice.cf_sync_confict here
+      # TODO flag Invoice.cf_sync_confict here
       logger.error "Failed to update invoice"
     end
   end
 
   # Magic Method
   # Maps Get/Set methods to QBO invoice object
-  def method_missing(sym, *arguments)  
+  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] == "="  
+      if method_name[-1, 1] == "="
-        @details.method(method_name).call(arguments[0])  
+        @details.method(method_name).call(arguments[0])
       # Getter
-      else  
+      else
         return @details.method(method_name).call 
       end
-    end  
+    end
   end
   
   # pull the details from quickbooks
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:invoice).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Invoice.new
     end

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,87 +10,15 @@
 
 class Qbo < ActiveRecord::Base
   unloadable
-  #validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
-  validates_presence_of :token, :company_id, :expire
-  serialize :token
-
-  OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
-  
-  #
-  # Getter for quickbooks OAuth2 client
-  #
-  def self.get_client
-    oauth_params = {
-     site: "https://appcenter.intuit.com/connect/oauth2",
-     authorize_url: "https://appcenter.intuit.com/connect/oauth2",
-     token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
-    }
-    return OAuth2::Client.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, oauth_params)
-  end
-  
-
-  #
-  # Getter for oauth consumer
-  #
-  def self.get_oauth_consumer
-    # Quickbooks Config Info
-    return $qb_oauth_consumer
-  end
-
-  # 
-  # Get a quickbooks base service object for type
-  # @params type of base
-  #
-  def self.get_base(type)
-    # lets getnourbold access token from the database
-    oauth2_client = get_client
-    qbo = self.first
-    access_token = OAuth2::AccessToken.from_hash(oauth2_client, qbo.token)
-
-    # check to see if we need to refresh the acesstoken
-    if qbo.expire.to_time.utc.past?
-      puts "Updating access token"
-      new_access_token_object = access_token.refresh!
-      qbo.token = new_access_token_object.to_hash
-      qbo.expire = 1.hour.from_now.utc
-      qbo.save!
-      access_token = new_access_token_object
-    else
-      puts "Using current token"
-    end
     
-    # build the reqiested service
+  include QuickbooksOauth
-    case type
-      when :item
-        return Quickbooks::Service::Item.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :time_activity
-       return Quickbooks::Service::TimeActivity.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :customer
-        return Quickbooks::Service::Customer.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :invoice
-        return Quickbooks::Service::Invoice.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :estimate
-        return Quickbooks::Service::Estimate.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :account
-        return Quickbooks::Service::Account.new(:company_id => qbo.company_id, :access_token => access_token)
-      when :employee
-        return Quickbooks::Service:: Employee.new(:company_id => qbo.company_id, :access_token => access_token)
-    else
-      return access_token
-    end
-   
-  end
-   
-   # Get the QBO account
-  def self.get_account
-    first
-  end
   
   # Updates last sync time stamp
   def self.update_time_stamp
+    date = DateTime.now
+    logger.info "Updating QBO timestamp to #{date}"
     qbo = Qbo.first
-    qbo.last_sync = DateTime.now
+    qbo.last_sync = date
     qbo.save
   end
   

app/models/qbo_purchase.rb

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

@@ -15,12 +15,9 @@ class Vehicle < ActiveRecord::Base
   belongs_to :customer
   has_many :issues, :foreign_key => 'vehicles_id'
   
-  #attr_accessible :year, :make, :model, :customer_id, :notes, :vin
-  
   validates_presence_of :customer
   validates :vin, uniqueness: true
   before_save :decode_vin
-  #after_find :get_details
   
   self.primary_key = :id
   
@@ -34,35 +31,12 @@ class Vehicle < ActiveRecord::Base
     end
   end
   
-  # returns the raw JSON details from EMUNDS
+  # returns the raw JSON details from NHTSA
   def details
     get_details if @details.nil?
     return @details
   end
   
-  # returns the style of the vehicle
-  def style
-    get_details if @details.nil?
-    begin
-      return @details.trim if @details
-    rescue
-      return nil
-    end
-  end
-  
-  # returns the drive of the vehicle i.e. 2 wheel, 4 wheel, ect.
-  def drive
-    #todo fix this
-    #return @details.drive_type if @details
-    return nil
-  end
-  
-  # returns the number of doors of the vehicle
-  def doors
-    get_details if @details.nil?
-    return @details.doors if @details
-  end
-  
   # Force Upper Case for make numbers
   def make=(val)
     # The to_s is in case you get nil/non-string
@@ -75,9 +49,8 @@ class Vehicle < ActiveRecord::Base
     write_attribute(:model, val.to_s.titleize)
   end
   
-  # Force Upper Case for VIN numbers
+  # Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
   def vin=(val)
-    #strip VIN of all illegal chars (for barcode scanner)
     val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
     write_attribute(:vin, val)
   end
@@ -93,8 +66,10 @@ class Vehicle < ActiveRecord::Base
     if @details
       begin
         self.year = @details.year unless @details.year.nil?
-	self.make = @details.make unless @details.make.nil?
+        self.make = @details.make unless @details.make.nil?
-	self.model = @details.model unless @details.model.nil?
+        self.model = @details.model unless @details.model.nil?
+        self.doors = @details.doors unless @details.doors.nil?
+        self.trim = @details.trim unless @details.trim.nil?
       rescue Exception => e
         errors.add(:vin, e.message)
       end
@@ -102,17 +77,17 @@ class Vehicle < ActiveRecord::Base
     self.name = to_s
   end
   
-private
+  private
   
-  # init method to pull JSON details from Edmunds
+  # init method to pull JSON details from NHTSA
   def get_details
     if self.vin?
       #validate the vin before calling a remote server
       validation = NhtsaVin.validate(self.vin)
       begin
-	#if the vin validation failed, raise an exception and exit
+        #if the vin validation failed, raise an exception and exit
-	raise RuntimeError, validation.error unless validation.valid?
+        raise RuntimeError, validation.error unless validation.valid?
-	# query NHTSA for details on the vin
+        # query NHTSA for details on the vin
         query = NhtsaVin.get(self.vin)
         raise RuntimeError, query.error unless query.valid?
         @details = query.response

app/views/customers/_details.html.erb

@@ -1,5 +1,11 @@
 <table>
   <tbody>
+
+    <tr>
+      <th><%=t(:label_name)%></th>
+      <td><%= customer.name %></td>
+    </tr>
+
     <tr>
       <th><%=t(:label_email)%></th>
       <td><%= customer.email %></td>
@@ -34,11 +40,10 @@
       <th><%=t(:field_notes)%></th>
       <td><%= customer.notes %></td>
     </tr>
-    
-    <tr>
-      <td>
-        <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
-      </td>
-    </tr>
   </tbody>
 </table>
+<div style="float: right;">
+  <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
+</div> 
+<br/>
+<br/>

app/views/customers/_form.html.erb

@@ -7,28 +7,28 @@
         <div class="clearfix">
           <%=t(:label_display_name)%> 
           <div class="input">
-            <%= f.text_field :name, :required => true, :autocomplete => "off"  %>
+            <%= f.text_field :name, :required => true, :autocomplete => "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_primary_phone)%>
           <div class="input">
-            <%= f.telephone_field :primary_phone, :autocomplete => "off"  %>
+            <%= f.telephone_field :primary_phone, :autocomplete => "off" %>
           </div>
         </div>
         
        <div class="clearfix">
           <%=t(:label_mobile_phone)%>:
           <div class="input">
-            <%= f.telephone_field :mobile_phone, :autocomplete => "off"  %>
+            <%= f.telephone_field :mobile_phone, :autocomplete => "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_email)%>:
           <div class="input">
-            <%= f.email_field :email, :autocomplete => "off"  %>
+            <%= f.email_field :email, :autocomplete => "off" %>
           </div>
         </div>
         

app/views/customers/_search.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag(customers_path, :method => "get", id: "search-form") do %>
-<%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
-<%= submit_tag t(:label_search) %>
+    <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>
-<%= button_to t(:label_sync), qbo_sync_path, method: :get%>
+<%= button_to(t(:label_sync), qbo_sync_path, method: :get) if User.current.admin?%>

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/show.html.erb

@@ -1,43 +1,42 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://app.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
-  <br/>
+  <div class="issue">
-
-  <div class="subject">
-    <div><h4><%=t(:label_details)%>:</h4></div>
-  </div>
-
-  <div class="attributes">
 
     <div class="splitcontent">
 
       <div class="splitcontentleft">
+
+        <h4><%=t(:label_details)%>:</h4>
+
         <%= render :partial => 'customers/details', locals: {customer: @customer} %>
 
-          <div class="splitcontent">
+        <div class="splitcontent">
-            <div class="splitcontentleft">
+          <div class="splitcontentleft">
-              <h4><%=t(:estimates)%>:</h4>
+            <h4><%=t(:estimates)%>:</h4>
-              <%= render :partial => 'estimates/list', locals: {customer: @customer} %>
+            <%= 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 class="splitcontentleft">
+            <h4><%=t(:label_invoices)%>:</h4>
+            <%= render :partial => 'invoices/list', locals: {customer: @customer} %>
+          </div>
+        </div>
+
       </div>
-      
+        
       <div class="splitcontentleft">
         <h4><%=t(:field_vehicles)%>:</h4>
         <%= render :partial => 'vehicles/list' %>
+        <div style="float: right;">
           <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
+        </div>
       </div>
     </div>
 
-    <br/>
-    <h2><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h2>
-    <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
-
-    <h2><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h2>
-    <%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
-
   </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

@@ -1,3 +1,5 @@
+<p style="float: right;"> <%= copy_object_url_link(request.url) %> </p>
+
 <h2><%= issue_heading(@issue) %></h2>
 
 <div class="<%= @issue.css_classes %> details">
@@ -5,7 +7,7 @@
 <%= avatar(@issue.author, :size => "50") %>
 
 <div class="subject">
-<%=  render_issue_subject_with_tree(@issue)  %>
+<%= 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">
@@ -20,13 +22,13 @@
   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 ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
+    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 ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
+    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'

app/views/estimates/_list.html.erb

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

app/views/estimates/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag("/qbo/estimate/doc", :method => "get", id: "est-search-form") do %>
+<%= 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/invoices/_list.html.erb

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

app/views/issues/_form_hook.html.erb

@@ -0,0 +1,14 @@
+<p>
+    <label for="issue_customer"><%= t(:customer) %></label>
+    <%= search_customer %> 
+    <%= customer_id %> 
+    <%= link_to_function(t(:label_load_customer), "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)") %>
+</p> 
+
+<p>
+    <%= select_estimate %>
+</p> 
+
+<p>
+    <%= vehicle %>
+</p>

app/views/issues/_history.html.erb

@@ -32,4 +32,4 @@
   <%= 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) %>
+<% 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/_show_details.html.erb

@@ -5,13 +5,13 @@
       <div class="value"><%= customer %></div>
     </div>
   
-    <div class="qbo_estimate_id attribute">
+    <div class="estimate_id attribute">
-      <div class="label"><span><%=t(:field_qbo_estimate)%></span>:</div>
+      <div class="label"><span><%=t(:field_estimate)%></span>:</div>
       <div class="value"><%= estimate_link %></div>
     </div>
          
-    <div class="qbo_invoice_id attribute">
+    <div class="invoice_id attribute">
-      <div class="label"><span><%=t(:field_qbo_invoice)%></span>:</div>
+      <div class="label"><span><%=t(:field_invoice)%></span>:</div>
       <div class="value"><%= invoice_link %></div>
     </div>
    </div>

app/views/payments/_form.html.erb

@@ -1,42 +0,0 @@
-<div class="row">
-  <div class="span6 columns">
-    <fieldset>
-
-      <%= form_for @payment do |f| %> 
-       
-        <div class="clearfix">
-          <%=t(:field_customer)%>: 
-          <div class="input">
-            <%= f.collection_select :customer_id, @customers, :id, :name, include_blank: true, :selected => @customer, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_deposit_into)%>: 
-          <div class="input">
-            <%= f.collection_select :account_id, @accounts, :id, :name, include_blank: true, :selected => @account, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_payment_method)%>: 
-          <div class="input">
-            <%= f.collection_select :payment_method_id, @payment_methods, :id, :name, include_blank: true, :selected => @payment_method, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_amount)%>: 
-          <div class="input">
-            <%= f.number_field :total_amount %>
-          </div>
-        </div>
-        
-       <div class="actions">
-        <%= f.submit %>
-       </div>
-      <% end %>
-
-    </fieldset>
-  </div>
-</div>

app/views/payments/new.html.erb

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

app/views/public/401.html.erb

@@ -1 +0,0 @@
-<%= flash.now[:error] = t(:label_401) %>

app/views/qbo/_settings.html.erb

@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2020 rick barrette
+Copyright (c) 2022 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -15,7 +15,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 <!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
 <script>
-intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Setting.host_name %>/qbo/authenticate'});
+  intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_path %>'});
 </script>
 
 <table >
@@ -24,33 +24,47 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     <tr>
       <th><%=t(:label_client_id)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
+        <input 
-                           value="<%= settings['settingsOAuthConsumerKey'] %>" 
+          type="text" 
-                           name="settings[settingsOAuthConsumerKey]" >
+          style="width:350px" 
+          id="settingsOAuthConsumerKey" 
+          value="<%= settings['settingsOAuthConsumerKey'] %>" 
+          name="settings[settingsOAuthConsumerKey]" >
       </td>
     </tr>
 
     <tr>
       <th><%=t(:label_client_secret)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
+        <input 
-                           value="<%= settings['settingsOAuthConsumerSecret'] %>"
+          type="text" 
-                           name="settings[settingsOAuthConsumerSecret]" >
+          style="width:350px" 
+          id="settingsOAuthConsumerSecret"
+          value="<%= settings['settingsOAuthConsumerSecret'] %>"
+          name="settings[settingsOAuthConsumerSecret]" >
       </td>
     </tr>
     
     <tr>
       <th><%=t(:label_webhook_token)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsWebhookToken"
+        <input 
-                           value="<%= settings['settingsWebhookToken'] %>"
+          type="text" 
-                           name="settings[settingsWebhookToken]" >
+          style="width:350px" 
+          id="settingsWebhookToken"
+          value="<%= settings['settingsWebhookToken'] %>"
+          name="settings[settingsWebhookToken]" >
       </td>
     </tr>
 
      <tr>
-       <th><%=t(:label_oauth_expires)%></th>
+        <th><%=t(:label_oauth_expires)%></th>
-       <td><%= if Qbo.exists? then Qbo.first.expire end %>
+        <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>
@@ -72,23 +86,19 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     </div>
       
     <div>
-        <b><%=t(:label_item_count)%>:</b> <%= QboItem.count %>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %>
-    </div>
-      
-    <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= QboEmployee.count %>
     </div>
     
     <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= QboInvoice.count %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %>
     </div>
     
     <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= QboEstimate.count %>
+        <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 " Sync Now", qbo_sync_path %>
+        <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/authenticate.html.erb

@@ -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,42 +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><%=t(:label_redmine_qbo)%></h1>
-    
-    <div>
-        <b><%=t(:label_customer_count)%>:</b> <%= @customer_count.to_s%>
-    </div>
-      
-    <div>
-        <b><%=t(:label_item_count)%>:</b> <%= @qbo_item_count.to_s %>
-    </div>
-      
-    <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= @qbo_employee_count.to_s %>
-    </div>
-    
-    <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= @qbo_invoice_count.to_s %>
-    </div>
-    
-    <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= @qbo_estimate_count.to_s %>
-    </div>
-      
-    <br/>
-    
-    <div>
-        <b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>
-    </div>
-    
-</body>

app/views/qbo/sync.html.erb

@@ -1,17 +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>
-
-    <h2>QboController#sync</h2>
-
-</body>

app/views/vehicles/_details.html.erb

@@ -1,31 +1,45 @@
-<table>
+<div class="issue">
-  <tbody>
+  <div class="splitcontent">
-  
+    <div class="splitcontentleft">
-    <tr>
+      <h4><%=t(:label_details)%>:</h4>
-      <th><%= t(:field_customer)%></th>
+      
-      <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
+      <table>
-    </tr>
+        <tbody>
-  
+
-    <tr>
+          <tr>
-      <th><%= t(:field_vehicle) %></th>
+            <th><%= t(:field_customer)%></th>
-      <td><%= vehicle.to_s %></td>
+            <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
-    </tr>
+          </tr>
-    
+        
-    <tr>
+          <tr>
-      <th><%= t(:field_vin) %></th>
+            <th><%= t(:field_vehicle) %></th>
-      <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
+            <td><%= vehicle.to_s %></td>
-    </tr>
+          </tr>
-    
+          
-    <tr>
+          <tr>
-      <th><%= t(:field_notes) %></th>
+            <th><%= t(:field_vin) %></th>
-      <td><%= vehicle.notes %></td>
+            <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
-    </tr>
+          </tr>
-    
+          
-    <tr>
+          <th><%= t(:label_trim) %></th>
-      <td>
+            <td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
-        <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
+          </tr>
-        <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
+        </tbody>
-      </td>
+      </table>
-    </tr>
+      
-  </tbody>
+    </div>
-</table>
+
+    <div class="splitcontentleft">
+
+      <h4><%=t(:field_notes)%>:</h4>
+        <td><%= vehicle.notes %></td>
+      </tr>
+
+    </div>
+  </div>
+</div>
+
+<div style="float: right;">
+  <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
+  <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
+</div>

app/views/vehicles/_form.html.erb

@@ -4,8 +4,8 @@
 
       <%= form_for @vehicle do |f| %> 
         <div class="clearfix">
-		      <%=t(:field_customer)%>:
+          <%=t(:field_customer)%>:
-	        <div class="input">
+          <div class="input">
             <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
             <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
           </div>

app/views/vehicles/_list.html.erb

@@ -11,7 +11,7 @@
         <br/>
         <%= vehicle.customer %>
         <br/>
-        <%= vehicle.vin %>
+        <%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
       </div>
     </div>
     <br/>

app/views/vehicles/_search.html.erb

@@ -1,4 +1,4 @@
 <%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), :autocomplete => "off"  %>
+  <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), :autocomplete => "off" %>
   <%= submit_tag t(:label_search) %>
 <% end %>

app/views/vehicles/show.html.erb

@@ -1,14 +1,11 @@
-<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%></h2>
-<br/>
 
-<div style="text-align: left; width:90%;">
+<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
-  <%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
 
-  <p><b><%=@issues.open.count%> <%=t(:label_open_issues)%> </b>  </p>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
 
-  <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
 
-  <p><b><%=@closed_issues.count%> <%=t(:label_closed_issues)%> </b> </p>
+<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
 
-  <%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>
+<%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>
-</div>

assets/javascripts/application.js

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

config/locales/en.yml

@@ -9,24 +9,22 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # English strings go here for Rails i18n
-# Usage t(:label)
+# Usage I18n.t(:label)
 en:
-  # my_label: "My label"
   field_customer: "Customer"
-  field_qbo_item: "Item"
+  field_item: "Item"
-  field_qbo_employee: "Employee"
+  field_employee: "Employee"
-  field_qbo_invoice: "Invoice"
+  field_invoice: "Invoice"
-  field_qbo_estimate: "Estimate" 
+  field_estimate: "Estimate" 
   field_vehicles: "Vehicles"
   field_vehicle: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
-  field_qbo_billed: "Billed"
+  field_billed: "Billed"
   label_week: "Week"
   label_search_estimates: "Search Estimates"
   label_search: "Search"
   label_estimates: "Estimates"
-  label_401: "Not Authorized"
   warn_ru_sure: "You sure?"
   label_delete: "Delete"
   label_edit: "Edit"
@@ -57,9 +55,7 @@ en:
   label_display_name: "Display Name"
   label_details: "Details"
   label_customer_link_expires: "This customer link expires in"
-  label_new_payment: "New Payment"
   label_amount: "Amount"
-  label_payment_method: "Payment Method"
   label_deposit_into: "Deposit to Account"
   label_last_sync: "Last Sync"
   label_redmine_qbo: "Redmine Quickbooks"
@@ -77,4 +73,20 @@ en:
   label_no_estimates: "No Estimates"
   label_no_invoices: "No Invoices"
   label_invoices: "Invoices"
-  label_load_customer: "Load Customer"
+  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"
+  

config/routes.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,9 +8,6 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# Main Quickbooks landing page
-get 'qbo', :to=> 'qbo#index'
-
 #authentication
 get 'qbo/authenticate', :to => 'qbo#authenticate'
 get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
@@ -18,22 +15,20 @@ get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
 #manual sync
 get 'qbo/sync', :to => 'qbo#sync'
 
+#webhook
+post 'qbo/webhook', :to => 'qbo#webhook'
+
 # Estimate & Invoice PDF
-get 'qbo/estimate/:id', :to => 'estimate#show', as: :estimate
+get 'estimates/:id', :to => 'estimate#show', as: :estimate
-get 'qbo/estimate/doc/:id', :to => 'estimate#doc', as: :estimate_doc
+get 'estimates/doc/', :to => 'estimate#doc', as: :estimate_doc
-get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
+get 'invoices/:id', :to => 'invoice#show', as: :invoice
 
 #manual billing
-get 'qbo/bill/:id', :to => 'qbo#bill', as: :bill
+get 'bill/:id', :to => 'qbo#bill', as: :bill
 
 #customer issue view
 get 'customers/view/:token', :to => 'customers#view', as: :view
-
+get 'customers/share/:id', :to => 'customers#share', as: :share
-#payments
-resources :payments
-
-#webhook
-post 'qbo/webhook', :to => 'qbo#qbo_webhook'
 
 #java script routes
 get 'filter_vehicles_by_customer' => 'customers#filter_vehicles_by_customer'
@@ -48,5 +43,3 @@ end
 
 #allow for just vehicles too
 resources :vehicles
-
-#resources :qbo_estimates

db/migrate/032_add_txn_dates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -26,7 +26,13 @@ class AddTxnDates < ActiveRecord::Migration[5.1]
 
         say "Sync Invoices"
 
-        invoices = QboInvoice.get_base.all
+        qbo = Qbo.first
+        invoices = qbo.perform_authenticated_request do |access_token|
+          service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+          service.all
+        end
+
+        return unless invoices
 
         invoices.each { |invoice|
             # Load the invoice into the database

db/migrate/033_update_vehicles_trim.rb

@@ -8,27 +8,23 @@
 #
 #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 LineItem < ActiveRecord::Base
+class UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
-  
+  def change
-  unloadable
+    add_column :vehicles, :doors, :text
-  
+    add_column :vehicles, :trim, :text
-  belongs_to :issue
+
-  
+    reversible do |direction|
-  #attr_accessible :amount, :description, :unit_price, :quantity, :item_id
+      direction.up {
-  validates_presence_of :amount, :description, :unit_price, :quantity
+
-  
+        # Update local vehicle database by forcing a save, look at before_save
-  def add_to_invoice(invoice)
+        vehicles = Vehicle.all
-    line_item = Quickbooks::Model::InvoiceLineItem.new
+        vehicles.each { |vehicle|
-    line_item.amount = amount
+            vehicle.save!
-    line_item.description = description
+        }
-    line_item.sales_item! do |detail|
+
-      detail.unit_price = unit_price
+      }
-      detail.quantity = quantity
-      detail.item_id = item_id # Item ID here... Where do i get this???
     end
-    
+
-    invoice.line_items << line_item
-    
-    return invoice
   end
+
 end

db/migrate/034_remove_qbo_items.rb

@@ -8,40 +8,10 @@
 #
 #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
+class RemoveQboItems < ActiveRecord::Migration[5.1]
-  unloadable
+  def change
-  has_many :issues
+    drop_table :qbo_items
-  #attr_accessible :name
+    drop_table :qbo_purchases
-  validates_presence_of :id, :name
+    drop_table :line_items
-
-  self.primary_key = :id
-
-  def self.get_base
-    Qbo.get_base(:item)
   end
-  
-  def self.sync 
-    last = Qbo.first.last_sync
-
-    query = "SELECT Id, Name FROM Item WHERE Type = 'Service' "
-    query << " AND  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last 
-   
-    if count == 0
-      items = get_base.all
-    else
-      items = get_base.query(query)
-    end
-
-    unless items.count = 0
-      items.find_by(:type, "Service").each { |i|
-        qbo_item = QboItem.find_or_create_by(id: i.id)
-        qbo_item.name = i.name
-        qbo_item.id = i.id
-        qbo_item.save
-      }
-    end
-      
-#    QboItem.where.not(items.map(&:id)).destroy_all
-  end
-  
 end

db/migrate/035_drop_qbo_prefix.rb

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

db/migrate/037_update_qbo_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,30 +8,15 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Payment
+class UpdateQboToken < ActiveRecord::Migration[5.1]
-  unloadable
+  def change
-  
+    add_column :qbos, :oauth2_access_token, :text
-  include ActiveModel::Model
+    add_column :qbos, :oauth2_access_token_expires_at, :datetime
-  
+    add_column :qbos, :oauth2_refresh_token, :text
-  attr_accessor :errors, :customer_id, :account_id, :payment_method_id, :total_amount
+    add_column :qbos, :oauth2_refresh_token_expires_at, :datetime
-  validates_presence_of :customer_id, :account_id, :payment_method_id, :total_amount
+    add_column :qbos, :realm_id, :text
-  validates :total_amount, numericality: true
+    remove_column :qbos, :company_id
-  
+    remove_column :qbos, :token
-  def save
+    remove_column :qbos, :expire
-    payment = Quickbooks::Model::Payment.new
-    payment.customer_id = @customer_id.to_i
-    payment.deposit_to_account_id = @account_id.to_i
-    payment.payment_method_id = @payment_method_id.to_i
-    payment.total = @total_amount
-    Qbo.get_base(:payment).update(payment)
   end
-  
-  def save!
-    save
-  end
-
-  # Dummy stub to make validtions happy.
-  def update_attribute
-  end
-
 end

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -22,20 +22,20 @@ Redmine::Plugin.register :redmine_qbo do
   name 'Redmine Quickbooks Online plugin'
   author 'Rick Barrette'
   description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
-  version '1.1.1'
+  version '2.1.0'
   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 => '4.0.0'
+  requires_redmine :version_or_higher => '5.1.0'
   
   # Add safe attributes for core models
   Issue.safe_attributes 'customer_id'
-  Issue.safe_attributes 'qbo_item_id'
+  Issue.safe_attributes 'item_id'
-  Issue.safe_attributes 'qbo_estimate_id'
+  Issue.safe_attributes 'estimate_id'
-  Issue.safe_attributes 'qbo_invoice_id'
+  Issue.safe_attributes 'invoice_id'
   Issue.safe_attributes 'vehicles_id'
-  User.safe_attributes 'qbo_employee_id'
+  User.safe_attributes 'employee_id'
-  TimeEntry.safe_attributes 'qbo_billed'
+  TimeEntry.safe_attributes 'billed'
   Project.safe_attributes 'customer_id'
   Project.safe_attributes 'vehicle_id'
 
@@ -48,9 +48,7 @@ Redmine::Plugin.register :redmine_qbo do
   # Permissions for security
   permission :view_customers, :customers => :index, :public => false
   permission :add_customers, :customers => :new, :public => false
-  permission :view_payments, :payments => :index, :public => false
+  permission :view_vehicles, :vehicles => :new, :public => false
-  permission :add_payments, :payments => :new, :public => false
-  permission :view_vehicles, :payments => :new, :public => false
 
   # Register top menu items
   menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}

lib/attachments_controller_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,27 +12,32 @@ require_dependency 'attachments_controller'
 
 module AttachmentsControllerPatch
 
-  def self.included(base) # :nodoc:
+  def self.included(base)
-    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
+
+      # check if login is globally required to access the application
+      def check_if_login_required
+        # no check needed if user is already logged in
+        return true if User.current.logged?
+        
+        # Pull up the attachmet, & verify if we have a valid token for the Issue
+        attachment = Attachment.find(params[:id])
+        token = CustomerToken.where("token = ? and expires_at > ?", session[:token], Time.now)
+        token = token.first
+        unless token.nil?
+          return true if token.issue_id == attachment.container_id
+        end
+        
+        require_login if Setting.login_required?
+      end
       
-      skip_before_action :read_authorize
     end
+
   end
-      
+
-  module ClassMethods
+end   
-    
-  end
-  
-  module InstanceMethods
-  
-  end
-end
 
 # Add module to AttachmentsController
 AttachmentsController.send(:include, AttachmentsControllerPatch)

lib/header_footer_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -14,6 +14,6 @@ class HeaderFooterHookListener < Redmine::Hook::ViewListener
   end
 
   def view_layouts_base_body_bottom(context = {})
-    return "<div id='qbo_footer' align='center'><b>#{I18n.translate(:label_last_sync)}: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
+    return "<div id='footer' align='center'><b>#{I18n.translate(:label_last_sync)}: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
   end
 end

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,7 +10,7 @@
 
 require_dependency 'issue'
 
-# Patches Redmine's Issues dynamically.  
+# Patches Redmine's Issues dynamically.
 # Adds a relationships
 module IssuePatch
 
@@ -24,10 +24,8 @@ module IssuePatch
       unloadable # Send unloadable so it will not be unloaded in development
       belongs_to :customer, primary_key: :id
       belongs_to :customer_token, primary_key: :id
-      belongs_to :qbo_estimate, primary_key: :id
+      belongs_to :estimate, primary_key: :id
-      has_and_belongs_to_many :qbo_invoices
+      has_and_belongs_to_many :invoices
-        #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
-  
       belongs_to :vehicle, primary_key: :id
     end
     
@@ -43,59 +41,60 @@ module IssuePatch
     def bill_time
      
       # Check to see if we have everything we need to bill the customer
-      #return unless status.is_closed?
       return if assigned_to.nil?
       return unless Qbo.first 
       return unless customer 
 
       # Get unbilled time entries
-      spent_time = time_entries.where(qbo_billed: [false, nil])
+      spent_time = time_entries.where(billed: [false, nil])
       spent_hours ||= spent_time.sum(:hours) || 0
       
       if spent_hours > 0 then
         
         # Prepare to create a new Time Activity
-        time_service = Qbo.get_base(:time_activity)
+        qbo = Qbo.first
-        item_service = Qbo.get_base(:item)
+        qbo.perform_authenticated_request do |access_token|
-        time_entry = Quickbooks::Model::TimeActivity.new
+          time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
+          item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
+          time_entry = Quickbooks::Model::TimeActivity.new
   
-        # Lets total up each activity before billing.
+          # Lets total up each activity before billing.
-        # This will simpify the invoicing with a single billable time entry per time activity
+          # This will simpify the invoicing with a single billable time entry per time activity
-        h = Hash.new(0)
+          h = Hash.new(0)
-        spent_time.each do |entry|
+          spent_time.each do |entry|
-          h[entry.activity.name] += entry.hours
+            h[entry.activity.name] += entry.hours
-          # update time entries billed status
+            # update time entries billed status
-          entry.qbo_billed = true
+            entry.billed = true
-          entry.save
+            entry.save
-        end
+          end
-        
-        # Now letes upload our totals for each activity as their own billable time entry
-        h.each do |key, val|
           
-          # Convert float spent time to hours and minutes
+          # Now letes upload our totals for each activity as their own billable time entry
-          hours = val.to_i
+          h.each do |key, val|
-          minutesDecimal = (( val - hours) * 60)
+            
-          minutes = minutesDecimal.to_i
+            # Convert float spent time to hours and minutes
+            hours = val.to_i
+            minutesDecimal = (( val - hours) * 60)
+            minutes = minutesDecimal.to_i
 
-          # Lets match the activity to an qbo item
+            # Lets match the activity to an qbo item
-          item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
+            item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
-          next if item.nil?
+            next if item.nil?
-          
+            
-          # Create the new billable time entry and upload it
+            # Create the new billable time entry and upload it
-          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
+            time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
-          # TODO entry.user.qbo_employee.id
+            time_entry.employee_id = assigned_to.employee_id 
-          time_entry.employee_id = assigned_to.qbo_employee_id 
+            time_entry.customer_id = customer_id
-          time_entry.customer_id = customer_id
+            time_entry.billable_status = "Billable"
-          time_entry.billable_status = "Billable"
+            time_entry.hours = hours
-          time_entry.hours = hours
+            time_entry.minutes = minutes
-          time_entry.minutes = minutes
+            time_entry.name_of = "Employee"
-          time_entry.name_of = "Employee"
+            time_entry.txn_date = Date.today
-          time_entry.txn_date = Date.today
+            time_entry.hourly_rate = item.unit_price
-          time_entry.hourly_rate = item.unit_price
+            time_entry.item_id = item.id 
-          time_entry.item_id = item.id 
+            time_entry.start_time = start_date
-          time_entry.start_time = start_date
+            time_entry.end_time = Time.now
-          time_entry.end_time = Time.now
+            time_service.create(time_entry)
-          time_service.create(time_entry)
+          end
         end
       end
     end
@@ -103,10 +102,10 @@ module IssuePatch
   
   # Create a shareable link for a customer
   def share_token
-    CustomerToken.create(:expires_at => Time.now + 1.month, :issue_id => id)
+    CustomerToken.get_token self
   end
   
-end    
+end  
 
 # Add module to Issue
 Issue.send(:include, IssuePatch)

lib/issues_controller_patch.rb

@@ -7,36 +7,29 @@
 #The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+require_dependency 'issues_controller'
 
-class QboEmployee < ActiveRecord::Base
+module IssuesControllerPatch
-  unloadable
+
-  has_many :users
+  module Helper
-  #attr_accessible :name
+    def watcher_link(issue, user)
-  validates_presence_of :id, :name
+      link = +''
-  
+      link << link_to(I18n.t(:label_bill_time), bill_path( issue.id ), method: :get, class: 'icon icon-email-add') if user.admin?
-  def self.get_base
+      link << link_to(I18n.t(:label_share), share_path( issue.id ), method: :get, target: :_blank, class: 'icon icon-shared') if user.logged?
-    Qbo.get_base(:employee)
+      link.html_safe + super
-  end
-  
-  def self.sync 
-    employees = get_base.all
-    
-    transaction do
-      # Update the item table
-      employees.each { |employee|
-        qbo_employee = 	find_or_create_by(id: employee.id)
-        qbo_employee.name = employee.display_name
-        qbo_employee.id = employee.id
-        qbo_employee.save!
-      }
     end
   end
 
-  def self.sync_by_id(id)
+  def self.included(base)
-    employee = get_base.fetch_by_id(id)
+
-    qbo_employee = find_or_create_by(id: employee.id)
+    base.class_eval do
-    qbo_employee.name = employee.display_name
+      unloadable # Send unloadable so it will not be unloaded in development
-    qbo_employee.id = employee.id
+      helper Helper
-    qbo_employee.save!
+    end
+
   end
-end
+
+end   
+
+# Add module to IssuessController
+IssuesController.send(:include, IssuesControllerPatch)

lib/issues_form_hook_listener.rb

@@ -10,7 +10,7 @@
 
 class IssuesFormHookListener < Redmine::Hook::ViewListener
 
-  # Load the javascript
+  # Load the javascript to support the autocomplete forms
   def view_layouts_base_html_head(context = {})
     js = javascript_include_tag 'application', :plugin => 'redmine_qbo'
     js += javascript_include_tag 'autocomplete-rails', :plugin => 'redmine_qbo'
@@ -18,19 +18,20 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
   end
 
   # Edit Issue Form
-  # TODO figure out how to do this with a view
+  # Here we build the required form components before passing them to a partial view formatting. 
   def view_issues_form_details_bottom(context={})
     f = context[:form]
 
-    #check project level customer/vehicle ownership first
+    # check project level customer ownership first
+    # This is done to preload customer information if the entire project is dedicated to a customer
     if context[:project]
       selected_customer = context[:project].customer ? context[:project].customer.id : nil
       selected_vehicle = context[:project].vehicle ? context[:project].vehicle.id : nil
     end
 
-    # Check to see if there are things attached to the issue
+    # Check to see if the issue already belongs to a customer
-    selected_customer =  context[:issue].customer ? context[:issue].customer.id  : nil
+    selected_customer = context[:issue].customer ? context[:issue].customer.id  : nil
-    selected_estimate =  context[:issue].qbo_estimate ? context[:issue].qbo_estimate.id  : nil
+    selected_estimate = context[:issue].estimate ? context[:issue].estimate.id  : nil
     selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
 
     # Load customer information
@@ -58,16 +59,27 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
       else
         vehicles = [nil].compact
       end
-      estimates = customer.qbo_estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
+      estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
     else
       vehicles = [nil].compact
       estimates = [nil].compact
     end
 
-    # Generate the drop down list of quickbooks extimates & vehicles
+    # Generate the drop down list of quickbooks estimates & vehicles
-    select_estimate = f.select :qbo_estimate_id, estimates, :selected => selected_estimate, include_blank: true
+    select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
     vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
 
-    return "<p><label for=\"issue_customer\">Customer</label>#{search_customer} #{customer_id} #{link_to_function I18n.t(:label_load_customer), "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
+    # Pass all prebuilt form components to our partial
+    context[:controller].send(:render_to_string, {
+      :partial => 'issues/form_hook',
+        locals: {
+          search_customer: search_customer, 
+	        customer_id: customer_id, 
+	        context: context, 
+	        select_estimate: select_estimate,
+	        vehicle: vehicle
+        } 
+      }
+    )
   end
 end

lib/issues_save_hook_listener.rb

@@ -19,7 +19,11 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
   # Called After Issue Saved
   def controller_issues_edit_after_save(context={})
     issue = context[:issue]
-    issue.bill_time if issue.status.is_closed?
+    begin
+      issue.bill_time if issue.status.is_closed?
+    rescue
+      # TODO flash[:error] = "Unable to bill, check QBO Auth"
+    end
   end
 
 end

lib/issues_show_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -17,28 +17,28 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     
     # Check to see if there is a quickbooks user attached to the issue
     if issue.customer
-      customer =  link_to issue.customer.name, "#{Redmine::Utils::relative_url_root}/customers/#{issue.customer.id}"
+      customer = link_to issue.customer.name, customer_path( issue.customer.id )
     end
     
     # Estimate Number
-    if issue.qbo_estimate
+    if issue.estimate
-      estimate =  issue.qbo_estimate.doc_number
+      estimate = issue.estimate.doc_number
-      estimate_link = link_to estimate, "#{Redmine::Utils::relative_url_root}/qbo/estimate/#{issue.qbo_estimate.id}", :target => "_blank"
+      estimate_link = link_to estimate, estimate_path( issue.estimate.id ), :target => "_blank"
     end
     
     # Invoice Number
     invoice_link = ""
-    if issue.qbo_invoice_ids
+    if issue.invoice_ids
-      issue.qbo_invoice_ids.each do |i|
+      issue.invoice_ids.each do |i|
-        invoice = QboInvoice.find i
+        invoice = Invoice.find i
-        invoice_link = invoice_link + link_to( invoice.doc_number, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{i}", :target => "_blank").to_s + " "
+        invoice_link = invoice_link + link_to( invoice.doc_number, invoice_path( i ), :target => "_blank").to_s + " "
 	      invoice_link = invoice_link.html_safe
       end
     end
     
     begin
       v = Vehicle.find(issue.vehicles_id)
-      vehicle = link_to v.to_s, "#{Redmine::Utils::relative_url_root}/vehicles/#{v.id}"
+      vehicle = link_to v.to_s, vehicle_path( v.id )
       vin = v.vin 
       notes = v.notes
     rescue
@@ -48,7 +48,7 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     split_vin = vin.scan(/.{1,9}/) if vin
 
     context[:controller].send(:render_to_string, {
-      :partial => 'qbo/issues_show_details',
+      :partial => 'issues/show_details',
         locals: {
           customer: customer, 
 	        estimate_link: estimate_link, 
@@ -59,11 +59,5 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
         } 
       })
   end
-
-  def view_issues_show_description_bottom(context={})
-    bill_button = button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get if User.current.admin?
-    share_button = button_to "Share", "#{Redmine::Utils::relative_url_root}/customers/view/#{context[:issue].share_token.token}", method: :get if User.current.logged?
-    return "<br/> #{bill_button} #{share_button}"
-  end
   
 end

lib/pdf_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -11,7 +11,7 @@
 require_dependency 'redmine/export/pdf'
 require_dependency 'redmine/export/pdf/issues_pdf_helper'
 
-module IssuesPdfHelperPatch
+module PdfPatch
 
   def self.included(base)
     base.send(:include, InstanceMethods)
@@ -89,14 +89,14 @@ module IssuesPdfHelperPatch
 
       if pdf.get_rtl
         border_first_top = 'RT'
-        border_last_top  = 'LT'
+        border_last_top = 'LT'
         border_first = 'R'
-        border_last  = 'L'
+        border_last = 'L'
       else
         border_first_top = 'LT'
-        border_last_top  = 'RT'
+        border_last_top = 'RT'
         border_first = 'L'
-        border_last  = 'R'
+        border_last = 'R'
       end
 
       rows = left.size > right.size ? left.size : right.size
@@ -109,9 +109,9 @@ module IssuesPdfHelperPatch
         heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
         pdf.SetFontStyle('',9)
         item = left[i]
-        heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
+        heights << pdf.get_string_height(60, item ? item.last.to_s : "")
         item = right[i]
-        heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
+        heights << pdf.get_string_height(60, item ? item.last.to_s : "")
         height = heights.max
 
         item = left[i]
@@ -122,7 +122,7 @@ module IssuesPdfHelperPatch
 
         item = right[i]
         pdf.SetFontStyle('B',9)
-        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "",  (i == 0 ? border_first_top : border_first), '', 0, 0)
+        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
         pdf.SetFontStyle('',9)
         pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
 
@@ -195,7 +195,7 @@ module IssuesPdfHelperPatch
         pdf.ln
         for changeset in issue.changesets
           pdf.SetFontStyle('B',8)
-          csstr  = "#{l(:label_revision)} #{changeset.format_identifier} - "
+          csstr = "#{l(:label_revision)} #{changeset.format_identifier} - "
           csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
           pdf.RDMCell(190, 5, csstr)
           pdf.ln
@@ -256,4 +256,4 @@ module IssuesPdfHelperPatch
   end
 end
 
-Redmine::Export::PDF::IssuesPdfHelper.send(:include, IssuesPdfHelperPatch)
+Redmine::Export::PDF::IssuesPdfHelper.send(:include, PdfPatch)

lib/project_patch.rb

@@ -10,7 +10,7 @@
 
 require_dependency 'project'
 
-# Patches Redmine's Projects dynamically.  
+# Patches Redmine's Projects dynamically.
 # Adds a relationships
 module ProjectPatch
 

lib/projects_form_hook_listener.rb

@@ -15,11 +15,11 @@ class ProjectsFormHookListener < Redmine::Hook::ViewListener
     f = context[:form]
  
     # Check to see if there is a quickbooks user attached to the issue
-    selected_customer =  context[:project].customer ? context[:project].customer  : nil
+    selected_customer = context[:project].customer ? context[:project].customer : nil
     selected_vehicle = context[:project].vehicle_id ? context[:project].vehicle_id : nil
     
     # Load customer information
-    customer = Customer.find_by_id(selected_customer) if selected_customer   
+    customer = Customer.find_by_id(selected_customer) if selected_customer
     search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#project_customer_id', :value => '#project_customer'}
     customer_id = f.hidden_field :customer_id, :id => "project_customer_id"
     
@@ -32,5 +32,5 @@ class ProjectsFormHookListener < Redmine::Hook::ViewListener
     vehicle = f.select :vehicle_id, vehicles, :selected => selected_vehicle, include_blank: true
     
     return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{vehicle}</p>"
-end
+  end
 end

lib/query_patch.rb

@@ -17,7 +17,7 @@ module QueryPatch
     unless @available_columns
       @available_columns = self.class.available_columns.dup
       @available_columns << QueryColumn.new(:customer, :sortable => "#{Issue.table_name}.customer_id", :groupable => true, :caption => :field_customer)
-      @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
+      @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.billed", :groupable => true, :caption => :field_billed)
     end
     super
   end
@@ -31,4 +31,4 @@ module QueryPatch
 end
 
 # Add module to Issue
-IssueQuery.send(:prepend, QueryPatch)
+IssueQuery.send(:prepend, QueryPatch)

lib/time_entry_query_patch.rb

@@ -16,18 +16,18 @@ module TimeEntryQueryPatch
   def available_columns
     unless @available_columns
       @available_columns = self.class.available_columns.dup
-      @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
+      @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_billed)
     end
     super
   end
   
   # Add QBO options to the filter
   def initialize_available_filters
-    add_available_filter "qbo_billed", :type => :boolean
+    add_available_filter "billed", :type => :boolean
     super
   end
 
 end
 
 # Add module to TimeEntryQuery
-TimeEntryQuery.send(:prepend, QueryPatch)
+TimeEntryQuery.send(:prepend, QueryPatch)

lib/user_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,7 +10,7 @@
 
 require_dependency 'user'
 
-# Patches Redmine's User dynamically.  
+# Patches Redmine's User dynamically.
 # Adds a relationships
 module UserPatch
   def self.included(base) # :nodoc:
@@ -21,7 +21,7 @@ module UserPatch
     # Same as typing in the class 
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
-      belongs_to :qbo_employee, primary_key: :id
+      belongs_to :employee, primary_key: :id
     end
   end
     
@@ -33,7 +33,7 @@ module UserPatch
   
   end
   
-end    
+end
 
 # Add module to Issue
 User.send(:include, UserPatch)

lib/users_show_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -14,12 +14,12 @@ class UsersShowHookListener < Redmine::Hook::ViewListener
   def view_users_form(context={})
     
     # Update the users
-    #QboEmployee.update_all
+    #Employee.update_all
  
     # Check to see if there is a quickbooks user attached to the issue
-    @selected = context[:user].qbo_employee.id if context[:user].qbo_employee
+    @selected = context[:user].employee.id if context[:user].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>"
+    return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
   end
 end

lib/view_hook_listener.rb

@@ -11,5 +11,5 @@
 class ViewHookListener < Redmine::Hook::ViewListener
 
   render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
-    
+  
 end

test/unit/qbo_employee_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class QboEmployeeTest < ActiveSupport::TestCase
+class EmployeeTest < ActiveSupport::TestCase
 
   # Replace this with your real tests.
   def test_truth