Version 1.1.0

titleize all subjects

Gemfile

@@ -1,9 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'quickbooks-ruby'
-gem 'quickbooks-ruby-base'
-gem 'oauth-plugin'
-gem 'oauth'
+gem 'oauth2', '1.4.7'
 gem 'roxml'
-gem 'edmunds_vin'
-gem 'will_paginate', '~> 3.1.0'
+gem 'nhtsa_vin'
+gem 'will_paginate'
+gem 'rails-jquery-autocomplete'
+gem 'jquery-ui-rails'
+
+group :assets do
+  gem 'coffee-rails'
+end

LICENSE

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

README.md

@@ -1,29 +1,42 @@
-#Redmine Quickbooks Online
+# Redmine Quickbooks Online
 
-A simple plugin for Redmine to connect to Quickbooks Online
+A plugin for Redmine to connect to Quickbooks Online
 
-The goal of this project is to allow redmine to connect with Quickbooks Online to create time activity entries for completed work when an issue is closed.
+The goal of this project is to allow Redmine to connect with Quickbooks Online to create `Time Activity Entries` for completed work when an Issue is closed.
 
-`Note: This project is under heavy development. Currently the initial functionality goal has been meet, however I am still working on adding other features. Tags should be stable`
+#### Disclaimer
 
-####How it works
-* Issues can be assigned to a QBO Customer and QBO Service Item via drop down in issues form
-  - The `QBO Employee` for the issue is assigned via the assigned redmine user
-  - IF an `Issue` has been assined a `QBO Customer`, `QBO Service Item` & `QBO Employee` when an `Issue` is closed the following will happen:
-  - A new `QBO Time Activity` agaist the `QBO Customer` will be created using the total spent hours logged agaist an `Issue`.
-  - The rate will be the set via the `QBO Service Item` price
-* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `QBO Service Item` cost.
-  - Needs to have a `QBO Customer` & `QBO Service Item` Assiged
-* Users will be assigned a `QBO Employee` via a drop down in the user admistration page.
+Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable
 
-##Prerequisites
+Use tags Version 1.0.0 & up for Redmine 4+ and Version 0.8.1 for Redine 3
+
+#### Features
+* 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
+  - This is set via a drop down in the user admistration page.
+* IF an `Issue` has been assined a `Customer` when an Issue is closed the following will happen:
+  - A new `Time Activity` will be billed agaist the `Customer` assinged to the issue for each Redmine Time Entery. 
+    + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
+    + The Time Activity names are used to 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` 
+  - Labor Rates are set by the `Item` in Quickbooks
+* `Payments` Can be created via the Redmine application menu
+* `Customers` Can be created via the Redmine application menu
+  - `Customers` can be searched
+  - Basic information for the `Customer` can be viewed/edit via the Customer page
+* Webhook Support
+  - `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
+    + `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
+  - `Customers` are automaticly updated in local database
+
+## 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
+## The Install
 
 1. To install, clone this repo into your plugin folder
 
@@ -35,34 +48,33 @@ The goal of this project is to allow redmine to connect with Quickbooks Online t
   
 3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
 
-  ![Alt plugin_config](/Screenshots/plugin_config.png)
-
 4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
 
 5. Assign an Employee to each of your users via the User Administration Page
 
-  ![Alt plugin_user_edit](/Screenshots/plugin_user_edit.png)
-  
 ## Usage
 
-  To enable automatic `QBO Time Activity` entries for an `Issue` , you need only to assign a `QBO Customer` and `QBO Item` to an `Issue` via drop downs in the creation/update form.
-  
-  ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
+  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 ~~Creation~~, ~~Update~~, Deletion
+  * 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 a rake file to create required Trackers or statuses required
   * Add Setting for Sandbox Mode
+  * Refactor Models prefixed with Qbo...
+  * Seperate Vehicles into a seperate plugin
+  * Make HTML Pretty 
+  * Intergrate Customer Search into Redmine Search
+  * Fix Issue sort by Customer
+  * MORE Stuff...
 
-##License
+## License
 
 The MIT License (MIT)
 
-Copyright (c) 2016 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:
 

app/controllers/customers_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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:
 #
@@ -13,11 +13,50 @@ class CustomersController < ApplicationController
   unloadable
 
   include AuthHelper
+  helper :issues
+  helper :journals
+  helper :projects
+  helper :custom_fields
+  helper :issue_relations
+  helper :watchers
+  helper :attachments
+  helper :queries
+  include QueriesHelper
+  helper :repositories
+  helper :sort
+  include SortHelper
+  helper :timelog
 
-  before_filter :require_user
+  before_action  :add_customer, :only => :new
+  before_action  :view_customer, :except => [:new, :view]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
 
   default_search_scope :names
 
+  autocomplete :customer, :name, :full => true, :extra_data => [:id]
+
+  def allowed_params
+    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number)
+  end
+
+  # getter method for a customer's vehicles
+  # used for customer autocomplete field / issue form
+  def filter_vehicles_by_customer
+    @filtered_vehicles = Vehicle.all.where(customer_id: params[:selected_customer])
+  end
+
+  # 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])
+  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])
+  end
+
   # display a list of all customers
   def index
     if params[:search]
@@ -28,12 +67,14 @@ class CustomersController < ApplicationController
     end
   end
 
+  # initialize a new customer
   def new
     @customer = Customer.new
   end
 
+  # create a new customer
   def create
-    @customer = Customer.new(params[:customer])
+    @customer = Customer.new(allowed_params)
     if @customer.save
       flash[:notice] = "New Customer Created"
       redirect_to @customer
@@ -48,7 +89,10 @@ class CustomersController < ApplicationController
     begin
       @customer = Customer.find_by_id(params[:id])
       @vehicles = @customer.vehicles.paginate(:page => params[:page])
-      @issues = @customer.issues
+      @issues = @customer.issues.order(id: :desc)
+      @billing_address = address_to_s(@customer.billing_address)
+      @shipping_address = address_to_s(@customer.shipping_address)
+      @closed_issues = (@issues - @issues.open)
     rescue ActiveRecord::RecordNotFound
       render_404
     end
@@ -67,7 +111,7 @@ class CustomersController < ApplicationController
   def update
     begin
       @customer = Customer.find_by_id(params[:id])
-      if @customer.update_attributes(params[:customer])
+      if @customer.update_attributes(allowed_params)
         flash[:notice] = "Customer updated"
         redirect_to @customer
       else
@@ -79,6 +123,7 @@ class CustomersController < ApplicationController
     end
   end
 
+  # delete a customer
   def destroy
     begin
       Customer.find_by_id(params[:id]).destroy
@@ -89,8 +134,53 @@ class CustomersController < ApplicationController
     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 = @token.first
+    if @token
+      session[:token] = @token.token
+      @issue = Issue.find @token.issue_id
+      @journals = @issue.journals.
+                  preload(:details).
+                  preload(:user => :email_address).
+                  reorder(:created_on, :id).to_a
+      @journals.each_with_index {|j,i| j.indice = i+1}
+      @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+      Journal.preload_journals_details_custom_fields(@journals)
+      @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
+      @journals.reverse! if User.current.wants_comments_in_reverse_order?
+
+      @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
+      @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+
+      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+      @priorities = IssuePriority.active
+      @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+      @relation = IssueRelation.new
+    else
+      render_403
+    end
+  end
+
   private
 
+  # redmine permission - add customers
+  def add_customer
+    global_check_permission(:add_customers)
+  end
+
+  # redmine permission - view customers
+  def view_customer
+    global_check_permission(:view_customers)
+  end
+
+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
   def only_one_non_zero?( array )
     found_non_zero = false
     array.each do |val|
@@ -102,4 +192,18 @@ class CustomersController < ApplicationController
     found_non_zero
   end
 
+  # format a quickbooks address to a human readable string
+  def address_to_s (address)
+    return if address.nil?
+    string =  address.line1
+    string << "\n" + address.line2 if address.line2
+    string << "\n" + address.line3 if address.line3
+    string << "\n" + address.line4 if address.line4
+    string << "\n" + address.line5 if address.line5
+    string << " " + address.city
+    string << ", " + address.country_sub_division_code
+    string << " " + address.postal_code
+    return string
+  end
+
 end

app/controllers/estimate_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,16 +12,34 @@ class EstimateController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user
+  before_action :require_user
   
   #
   # Downloads and forwards the estimate pdf
   #
   def show
-    base = QboEstimate.get_base.service
-    estimate = base.fetch_by_id(params[:id])
-    @pdf = base.pdf(estimate)
-    send_data @pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    e = QboEstimate.find_by_id(params[:id]) if params[:id]
+    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"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
+  end
+
+  #
+  # Downloads estimate by document number
+  #
+  def doc
+    e = QboEstimate.find_by_doc_number(params[:id]) if params[:id]
+    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"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
   end
 
 end

app/controllers/invoice_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,13 +12,14 @@ class InvoiceController < ApplicationController
   
   include AuthHelper
   
-  before_filter :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? }
   
   #
   # Downloads and forwards the invoice pdf
   #
   def show
-    base = QboInvoice.get_base.service
+    base = QboInvoice.get_base
     invoice = base.fetch_by_id(params[:id])
     @pdf = base.pdf(invoice)
     send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"

app/controllers/line_items_controler.rb

@@ -0,0 +1,94 @@
+#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/payments_controller.rb

@@ -0,0 +1,57 @@
+#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 PaymentsController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_action :check_permissions
+  
+  def new
+    @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
+    if !allowed_to?(:add_payments)
+      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+    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
+
+end

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,8 +15,12 @@ class QboController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user, :except => :qbo_webhook
-  skip_before_filter :verify_authenticity_token, :check_if_login_required
+  before_action :require_user, :except => :qbo_webhook
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
+
+  def allowed_params
+    params.permit(:code, :state, :realmId, :id)
+  end
 
   #
   # Called when the QBO Top Menu us shown
@@ -34,38 +38,62 @@ class QboController < ApplicationController
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
-    callback = qbo_oauth_callback_url
-    token = Qbo.get_oauth_consumer.get_request_token(:oauth_callback => callback)
-    session[:qb_request_token] = Marshal.dump(token)
-    redirect_to("https://appcenter.intuit.com/Connect/Begin?oauth_token=#{token.token}") and return
+    oauth2_client = Qbo.get_client
+    callback = Setting.host_name + "/qbo/oauth_callback/" 
+    #callback = qbo_oauth_callback_url
+    grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
+    redirect_to grant_url
   end
   
   #
   # Called by QBO after authentication has been processed
   #
   def oauth_callback
-    at = Marshal.load(session[:qb_request_token]).get_access_token(:oauth_verifier => params[:oauth_verifier])
+    if params[:state].present?
+      oauth2_client = Qbo.get_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 = Setting.host_name + "/qbo/oauth_callback/"
+      if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
         
-    #There can only be one...
-    Qbo.destroy_all
+        # Remove the last authentication information
+        Qbo.delete_all
         
-    # Save the authentication information 
-    qbo = Qbo.new
-    qbo.qb_token = at.token
-    qbo.qb_secret = at.secret
-    qbo.token_expires_at = 6.months.from_now.utc
-    qbo.reconnect_token_at = 5.months.from_now.utc
-    qbo.company_id = params['realmId']
-    if qbo.save!
-      redirect_to qbo_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+        # Save the authentication information 
+        qbo = Qbo.new
+        qbo.company_id = params[:realmId]
+        
+        # Generate Access Token & Serialize it into the database
+        access_token = OAuth2::AccessToken.new(oauth2_client, resp.token, refresh_token: resp.refresh_token)
+        qbo.token = access_token.to_hash
+        qbo.expire = 1.hour.from_now.utc
+        
+        if qbo.save!
+          redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+        else
+          redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
+        end
+        
+      end
+    end
+  end
+  
+  # Manual Billing
+  def bill
+    i = Issue.find_by_id params[:id]
+    if i.customer
+      i.bill_time
+      redirect_to i, :flash => { :notice => "Successfully Billed #{i.customer.name}" }
     else
-      redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
+      redirect_to i, :flash => { :error => "Cannot bill without a customer assigned" }
     end
   end
   
   # Quickbooks Webhook Callback
   def qbo_webhook
 
+    logger.debug "Quickbooks is calling webhook"
+    
     # check the payload
     signature = request.headers['intuit-signature']
     key = Setting.plugin_redmine_qbo['settingsWebhookToken']
@@ -89,6 +117,8 @@ class QboController < ApplicationController
         # TODO rename all other models!
         name.prepend("Qbo") if not name.eql? "Customer"
        
+        logger.debug "Casting #{name.constantize} to obj"
+
         # Magicly initialize the correct class
         obj = name.constantize
 
@@ -100,7 +130,13 @@ class QboController < ApplicationController
             obj.destroy(id)
         #if not then update!
         else
-          obj.sync_by_id(id)
+          begin
+            obj.sync_by_id(id)
+          rescue => e
+            logger.error "Failed to call sync_by_id on obj"
+            logger.error e.message
+            logger.error e.backtrace.join("\n")
+          end
         end
       end
       
@@ -112,23 +148,30 @@ class QboController < ApplicationController
     else
       render nothing: true, status: 400
     end
+
+    logger.debug "Quickbooks webhook complete"
   end
 
   #
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
-    if Qbo.exists?
-      Customer.sync
-      QboItem.sync
-      QboEmployee.sync
-      QboEstimate.sync
-      QboInvoice.sync
+    logger.debug "Syncing EVERYTHING"
+    # Update info in background
+    Thread.new do
+      if Qbo.exists?
+        Customer.sync
+        QboInvoice.sync
+        QboItem.sync
+        QboEmployee.sync
+        QboEstimate.sync
         
-      # Record the last sync time
-      Qbo.update_time_stamp
+        # Record the last sync time
+        Qbo.update_time_stamp
+      end
+      ActiveRecord::Base.connection.close
     end
 
-    redirect_to qbo_path(:redmine_qbo), :flash => { :notice => "Successfully synced to Quickbooks" }
+    redirect_to :home, :flash => { :notice => "Successfully synced to Quickbooks" }
   end
 end

app/controllers/vehicles_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,10 +14,23 @@ class VehiclesController < ApplicationController
 
   include AuthHelper
 
-  before_filter :require_user
+  before_action :require_user
+
+  def allowed_params
+    params.require(:vehicle).permit(:year, :make, :model, :customer_id, :notes, :vin)
+  end
 
   # display a list of all vehicles
   def index
+    if params[:customer_id]
+      begin
+        @vehicles = Customer.find_by_id(params[:customer_id]).vehicles.paginate(:page => params[:page])
+      rescue ActiveRecord::RecordNotFound
+        render_404
+      end
+    end
+
+    # search for a vehicle by vin
     if params[:search]
       @vehicles = Vehicle.search(params[:search]).paginate(:page => params[:page])
       if only_one_non_zero?(@vehicles)
@@ -29,18 +42,18 @@ class VehiclesController < ApplicationController
   # return an HTML form for creating a new vehicle
   def new
     @vehicle = Vehicle.new
-    @customers = Customer.all.order(:name)
+    @customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
   end
 
   # create a new vehicle
   def create
-    @vehicle = Vehicle.new(params[:vehicle])
+    @vehicle = Vehicle.new(allowed_params)
     if @vehicle.save
       flash[:notice] = "New Vehicle Created"
       redirect_to @vehicle
     else
       flash[:error] = @vehicle.errors.full_messages.to_sentence
-      redirect_to new_vehicle_path
+      redirect_to Vehicle.find_by_vin @vehicle.vin
     end
   end
 
@@ -48,6 +61,7 @@ class VehiclesController < ApplicationController
   def show
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
+      @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
     rescue ActiveRecord::RecordNotFound
       render_404
     end
@@ -57,8 +71,7 @@ class VehiclesController < ApplicationController
   def edit
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      @customer = @vehicle.customer.id
-      @customers = Customer.all.order(:name)
+      @customer = @vehicle.customer
     rescue ActiveRecord::RecordNotFound
       render_404
     end
@@ -69,13 +82,14 @@ class VehiclesController < ApplicationController
     @customer = params[:customer]
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(params[:vehicle])
+      if @vehicle.update_attributes(allowed_params)
         flash[:notice] = "Vehicle updated"
         redirect_to @vehicle
       else
-        flash[:error] = @vehicle.errors.full_messages.to_sentence if @vehicle.errors
         redirect_to edit_vehicle_path
       end
+      #show any errors anyways
+      flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
     rescue ActiveRecord::RecordNotFound
       render_404
     end
@@ -94,6 +108,8 @@ class VehiclesController < ApplicationController
 
   private
 
+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
   def only_one_non_zero?( array )
     found_non_zero = false
     array.each do |val|

app/helpers/auth_helper.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -11,8 +11,43 @@
 module AuthHelper
 
   def require_user
+    return unless session[:token].nil?
     if !User.current.logged?
       render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true
     end
   end
+  
+  def allowed_to?(action)
+    return false if User.current.nil?
+    project = Project.find(params[:project_id])
+    return false if project.nil?
+    return true if User.current.allowed_to?(action, project)
+    false
+  end
+  
+  def check_permission(permission)
+    if !allowed_to?(permission)
+      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+    end
+  end
+  
+  
+  def global_check_permission(permission)
+    if !globaly_allowed_to?(permission)
+      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+    end
+  end
+  
+  def globaly_allowed_to?( action)
+    return false if User.current.nil?
+
+    projects = Project.all
+    projects.each { |p|
+      if User.current.allowed_to?(action, p)
+        return true
+      end
+    }
+    false
+  end
+    
 end

app/models/customer.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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:
 #
@@ -13,9 +13,11 @@ class Customer < ActiveRecord::Base
   
   has_many :issues
   has_many :qbo_purchases
+  has_many :qbo_invoices
+  has_many :qbo_estimates
   has_many :vehicles
   
-  attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone
+  #attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone, :phone_number
   validates_presence_of :id, :name
   
   self.primary_key = :id
@@ -61,6 +63,8 @@ class Customer < ActiveRecord::Base
     pn = Quickbooks::Model::TelephoneNumber.new
     pn.free_form_number = n
     @details.primary_phone = pn
+    #update our locally stored number too
+    update_phone_number
   end
   
   # Convenience Method
@@ -81,6 +85,26 @@ class Customer < ActiveRecord::Base
     pn = Quickbooks::Model::TelephoneNumber.new
     pn.free_form_number = n
     @details.mobile_phone = pn
+    #update our locally stored number too
+    update_mobile_phone_number
+  end
+  
+  # update the localy stored phone number as a plain string with no special chars
+  def update_phone_number
+    begin
+      self.phone_number = self.primary_phone.tr('^0-9', '')
+    rescue
+      return nil
+    end
+  end
+  
+  # update the localy stored phone number as a plain string with no special chars
+  def update_mobile_phone_number
+    begin
+      self.mobile_phone_number = self.mobile_phone.tr('^0-9', '')
+    rescue
+      return nil
+    end
   end
   
   # Convenience Method
@@ -112,7 +136,7 @@ class Customer < ActiveRecord::Base
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync 
-    service = Qbo.get_base(:customer).service
+    service = Qbo.get_base(:customer)
 
     # Sync ALL customers if the database is empty
     #if count == 0
@@ -140,15 +164,16 @@ class Customer < ActiveRecord::Base
     end
   end
   
-  # Searchs the database for a customer by name
+  # Searchs the database for a customer by name or phone number with out special chars
   def self.search(search)
-    where("name LIKE ?", "%#{search}%").order(:name)
+    customers = where("name LIKE ? OR phone_number LIKE ? OR mobile_phone_number LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%")
+    return customers.order(:name)
   end
   
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync_by_id(id) 
-    service = Qbo.get_base(:customer).service
+    service = Qbo.get_base(:customer)
 
     customer = service.fetch_by_id(id)
     qbo_customer = Customer.find_or_create_by(id: customer.id)
@@ -168,7 +193,7 @@ class Customer < ActiveRecord::Base
   # Push the updates
   def save_with_push
     begin
-      @details = Qbo.get_base(:customer).service.update(@details)
+      @details = Qbo.get_base(:customer).update(@details)
       #raise "QBO Fault" if @details.fault?
       self.id = @details.id
     rescue Exception => e
@@ -186,7 +211,7 @@ class Customer < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:customer).find_by_id(self.id)
+      @details = Qbo.get_base(:customer).fetch_by_id(self.id)
     rescue Exception => e
       @details = Quickbooks::Model::Customer.new
     end

app/models/customer_token.rb

@@ -0,0 +1,23 @@
+#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 CustomerToken < ActiveRecord::Base
+  unloadable
+  has_many :issues
+  #attr_accessible :token, :expires_at, :issue_id
+  validates_presence_of :expires_at, :issue_id
+  before_create :generate_token
+
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE_QBO__' + SecureRandom.uuid
+  
+  def generate_token
+    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
+  end
+end

app/models/line_item.rb

@@ -0,0 +1,34 @@
+#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 LineItem < ActiveRecord::Base
+  
+  unloadable
+  
+  belongs_to :issue
+  
+  #attr_accessible :amount, :description, :unit_price, :quantity, :item_id
+  validates_presence_of :amount, :description, :unit_price, :quantity
+  
+  def add_to_invoice(invoice)
+    line_item = Quickbooks::Model::InvoiceLineItem.new
+    line_item.amount = amount
+    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

app/models/payment.rb

@@ -0,0 +1,37 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2020 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 Payment
+  unloadable
+  
+  include ActiveModel::Model
+  
+  attr_accessor :errors, :customer_id, :account_id, :payment_method_id, :total_amount
+  validates_presence_of :customer_id, :account_id, :payment_method_id, :total_amount
+  validates :total_amount, numericality: true
+  
+  def save
+    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

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2020 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,34 +10,76 @@
 
 class Qbo < ActiveRecord::Base
   unloadable
-  validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
+  #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']
   
-  $qb_oauth_consumer = OAuth::Consumer.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, {
-      :site                 => "https://oauth.intuit.com",
-      :request_token_path   => "/oauth/v1/get_request_token",
-      :authorize_url        => "https://appcenter.intuit.com/Connect/Begin",
-      :access_token_path    => "/oauth/v1/get_access_token"
-    })
-    
-  # Configure quickbooks-ruby-base to access our database
-  Quickbooks::Base.configure do |c|
-    c.persistent_token = 'qb_token'
-    c.persistent_secret = 'qb_secret'
-    c.persistent_company_id =  'company_id'
+  #
+  # 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 object for type
+  # 
+  # Get a quickbooks base service object for type
   # @params type of base
+  #
   def self.get_base(type)
-    Quickbooks::Base.new(first, type)
+    # lets getnourbold access token from the database
+    oauth2_client = get_client
+    qbo = self.first
+    access_token = OAuth2::AccessToken.from_hash(oauth2_client, qbo.token)
+
+    # check to see if we need to refresh the acesstoken
+    if qbo.expire.to_time.utc.past?
+      puts "Updating access token"
+      new_access_token_object = access_token.refresh!
+      qbo.token = new_access_token_object.to_hash
+      qbo.expire = 1.hour.from_now.utc
+      qbo.save!
+      access_token = new_access_token_object
+    else
+      puts "Using current token"
+    end
+    
+    # build the reqiested service
+    case type
+      when :item
+        return Quickbooks::Service::Item.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :time_activity
+       return Quickbooks::Service::TimeActivity.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :customer
+        return Quickbooks::Service::Customer.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :invoice
+        return Quickbooks::Service::Invoice.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :estimate
+        return Quickbooks::Service::Estimate.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :account
+        return Quickbooks::Service::Account.new(:company_id => qbo.company_id, :access_token => access_token)
+      when :employee
+        return Quickbooks::Service:: Employee.new(:company_id => qbo.company_id, :access_token => access_token)
+    else
+      return access_token
+    end
+   
   end
    
    # Get the QBO account

app/models/qbo_employee.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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:
 #
@@ -11,7 +11,7 @@
 class QboEmployee < ActiveRecord::Base
   unloadable
   has_many :users
-  attr_accessible :name
+  #attr_accessible :name
   validates_presence_of :id, :name
   
   def self.get_base
@@ -19,7 +19,7 @@ class QboEmployee < ActiveRecord::Base
   end
   
   def self.sync 
-    employees = get_base.service.all
+    employees = get_base.all
     
     transaction do
       # Update the item table
@@ -33,7 +33,7 @@ class QboEmployee < ActiveRecord::Base
   end
 
   def self.sync_by_id(id)
-    employee = get_base.service.fetch_by_id(id)
+    employee = get_base.fetch_by_id(id)
     qbo_employee = find_or_create_by(id: employee.id)
     qbo_employee.name = employee.display_name
     qbo_employee.id = employee.id

app/models/qbo_estimate.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,44 +10,88 @@
 
 class QboEstimate < ActiveRecord::Base
   unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
   
+  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 
-    estimates = get_base.service.all
-  
-    # Update the item table
-    transaction do
-        estimates.each { |estimate|
-          qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
-          qbo_estimate.doc_number = estimate.doc_number
-          qbo_estimate.id = estimate.id
-          qbo_estimate.save!
-        }
-    end
+    estimates = get_base.all
+    estimates.each { |estimate|
+      process_estimate(estimate)
+    }
 
     #remove deleted estimates
     where.not(estimates.map(&:id)).destroy_all
   end
   
+  # sync only one estimate
   def self.sync_by_id(id)
-    estimate = get_base.service.fetch_by_id(id)
-    qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
+    process_estimate(get_base.fetch_by_id(id))
+  end
+  
+  # update an estimate
+  def self.update(id)
+    # Update the item table
+    estimate = get_base.fetch_by_id(id)
+    qbo_estimate = find_or_create_by(id: id)
     qbo_estimate.doc_number = estimate.doc_number
-    qbo_estimate.id = estimate.id
     qbo_estimate.save!
   end
   
-  def self.update(id)
-    # Update the item table
-    estimate = get_base.service.fetch_by_id(id)
-      qbo_estimate = QboEstimate.find_or_create_by(id: id)
-      qbo_estimate.doc_number = estimate.doc_number
-      qbo_estimate.save!
+  # process an estimate into the database
+  def self.process_estimate(estimate)
+    qbo_estimate = find_or_create_by(id: estimate.id)
+    qbo_estimate.doc_number = estimate.doc_number
+    qbo_estimate.customer_id = estimate.customer_ref.value
+    qbo_estimate.id = estimate.id
+    qbo_estimate.txn_date = estimate.txn_date
+    qbo_estimate.save!
   end
+
+  # download the pdf from quickbooks
+  def pdf
+    base = QboEstimate.get_base
+    estimate = base.fetch_by_id(id)
+    return base.pdf(estimate)
+  end
+
+  # Magic Method
+  # Maps Get/Set methods to QBO estimate object
+  def method_missing(sym, *arguments)  
+    # Check to see if the method exists
+    if Quickbooks::Model::Estimate.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="  
+        @details.method(method_name).call(arguments[0])  
+      # Getter
+      else  
+        return @details.method(method_name).call 
+      end
+    end  
+  end
+
+  private
+  
+  # pull the details
+  def pull
+    begin
+      raise Exception unless self.id
+      @details = Qbo.get_base(:estimate).fetch_by_id(self.id)
+    rescue Exception => e
+      @details = Quickbooks::Model::Estimate.new
+    end
+  end
+  
 end

app/models/qbo_invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,54 +10,180 @@
 
 class QboInvoice < ActiveRecord::Base
   unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
+  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
-    #Pull the invoices from the quickbooks server
-    #invoices = get_base.service.all
-    
+    logger.debug "Syncing all invoices"
     last = Qbo.first.last_sync
 
     query = "SELECT Id, DocNumber FROM Invoice"
     query << " WHERE  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
   
+    # TODO actually do something with the above query
+    # .all() is never called since count is never initialized
     if count == 0
-      invoices = get_base.service.all 
+      invoices = get_base.all 
     else
-      invoices = get_base.service.query()
+      invoices = get_base.query()
     end
      
-    # Update the invoice table 
     invoices.each { | invoice | 
-      qbo_invoice = find_or_create_by(id: invoice.id) 
-      qbo_invoice.doc_number = invoice.doc_number 
-      qbo_invoice.id = invoice.id
-      qbo_invoice.save! 
+      process_invoice invoice
     }
-    
-    #remove deleted invoices 
-    #where.not(invoices.map(&:id)).destroy_all
   end
   
+  #sync by invoice ID
   def self.sync_by_id(id)
-    invoice = get_base.service.fetch_by_id(id) 
-    qbo_invoice = find_or_create_by(id: invoice.id) 
+    logger.debug "Syncing invoice #{id}"
+    invoice = get_base.fetch_by_id(id) 
+    process_invoice invoice
+  end
+  
+  private
+  
+  # Attach the invoice to the issue
+  def self.attach_to_issue(issue, invoice)
+    return if issue.nil?
+    
+    # skip this issue if the issue customer is not the same as the invoice customer
+    return if issue.customer_id != invoice.customer_ref.value.to_i
+    
+    logger.debug "Attaching invoice #{invoice.id} to issue #{issue.id}"
+    
+    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+
+    unless issue.qbo_invoices.include?(qbo_invoice)
+      issue.qbo_invoices << qbo_invoice
+      issue.save!
+    end
+    
+    compare_custom_fields(issue, invoice)
+  end
+  
+  # processes the invoice into the database
+  def self.process_invoice(invoice)
+    logger.debug "Processing invoice"
+
+    # Load the invoice into the database
+    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
     qbo_invoice.doc_number = invoice.doc_number 
     qbo_invoice.id = invoice.id
+    qbo_invoice.customer_id = invoice.customer_ref
+    qbo_invoice.txn_date = invoice.txn_date
     qbo_invoice.save!
+
+    # Scan the private notes  for hashtags and attach to the applicable issues
+    if not invoice.private_note.nil?
+      invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
+        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|
+      if line.description
+        line.description.scan(/#(\w+)/).flatten.each { |issue|
+          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+        }
+      end
+    }
   end
   
-  def self.update(id)
-    # Update the item table
-    invoice = get_base.service.fetch_by_id(id)
-      qbo_invoice = find_or_create_by(id: id)
-      qbo_invoice.doc_number = invoice.doc_number
-      qbo_invoice.save!
+  # compares the custome fields on invoices & issues and updates the invoice as needed
+  #
+  # the issue here is when two or more issues share an invoice with the same custom field, but diffrent values
+  # this condions causes an infinite loop as the webhook is called when an invoice is updated
+  # TODO maybe add a cf_sync_confict flag to invoices
+  def self.compare_custom_fields(issue, invoice)
+    # TODO break if QboInvoice.find(invoice.id).cf_sync_confict
+    is_changed = false
+    
+    # update the invoive custom fields with infomation from the issue if available
+    invoice.custom_fields.each { |cf|
+      
+      # VIN from the attached vehicle
+      # TODO move this into seperate plugin
+      # TODO create hook for seperate plugin 
+      begin
+        if cf.name.eql? "VIN"
+          vin = Vehicle.find(issue.vehicles_id).vin
+          break if vin.nil?
+          if not cf.string_value.to_s.eql? vin
+            cf.string_value = vin.to_s
+            logger.debug "VIN has changed"
+            is_changed = true
+          end
+        end
+      rescue
+        #do nothing
+      end
+      
+      # Custom Values
+      begin
+        value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
+        
+        # Check to see if the value is blank...
+        if not value.value.to_s.blank?
+          # Check to see if the value is diffrent
+          if not cf.string_value.to_s.eql? value.value.to_s
+            # update the custom field on the invoice
+            cf.string_value = value.value.to_s
+            is_changed = true
+          end
+        end
+      rescue
+        # Nothing to do here, there is no match
+      end
+    }
+
+    # Push updates
+    begin
+      logger.debug "Trying to update invoice"
+      get_base.update(invoice) if is_changed
+    rescue
+      # Do nothing, probaly custome field  sync confict on the invoice. 
+      # This is a problem with how it's billed
+      # TODO Add notes in memo area
+      # TODO flag QboInvoice.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)  
+    # Check to see if the method exists
+    if Quickbooks::Model::Invoice.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="  
+        @details.method(method_name).call(arguments[0])  
+      # Getter
+      else  
+        return @details.method(method_name).call 
+      end
+    end  
+  end
+  
+  # pull the details from quickbooks
+  def pull
+    begin
+      raise Exception unless self.id
+      @details = Qbo.get_base(:invoice).fetch_by_id(self.id)
+    rescue Exception => e
+      @details = Quickbooks::Model::Invoice.new
+    end
+  end
+    
 end

app/models/qbo_item.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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:
 #
@@ -11,7 +11,7 @@
 class QboItem < ActiveRecord::Base
   unloadable
   has_many :issues
-  attr_accessible :name
+  #attr_accessible :name
   validates_presence_of :id, :name
 
   self.primary_key = :id
@@ -27,9 +27,9 @@ class QboItem < ActiveRecord::Base
     query << " AND  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last 
    
     if count == 0
-      items = get_base.service.all
+      items = get_base.all
     else
-      items = get_base.service.query(query)
+      items = get_base.query(query)
     end
 
     unless items.count = 0

app/models/qbo_purchase.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,7 +12,7 @@ class QboPurchase < ActiveRecord::Base
   unloadable
   belongs_to :issues
   belongs_to :qbo_customer
-  attr_accessible :description
+  #attr_accessible :description
   validates_presence_of :id, :line_id, :description, :qbo_customer_id
   
   def self.get_base
@@ -20,11 +20,11 @@ class QboPurchase < ActiveRecord::Base
   end
 
   def get_purchase(id)
-    get_base.service.find_by_id(id)
+    get_base.find_by_id(id)
   end
 
   def self.sync
-   QboPurchase.get_base.service.all.each { |purchase|
+   QboPurchase.get_base.all.each { |purchase|
       
       purchase.line_items.all? { |line_item|
         

app/models/vehicle.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,36 +12,39 @@ class Vehicle < ActiveRecord::Base
   
   unloadable
   
-  API_KEY = Setting.plugin_redmine_qbo['settingsEdmundsAPIKey']
-  
   belongs_to :customer
   has_many :issues, :foreign_key => 'vehicles_id'
   
-  attr_accessible :year, :make, :model, :customer_id, :notes, :vin
+  #attr_accessible :year, :make, :model, :customer_id, :notes, :vin
   
   validates_presence_of :customer
   validates :vin, uniqueness: true
-  #validates :year, numericality: { only_integer: true }
-  
   before_save :decode_vin
-  after_initialize :get_details
+  #after_find :get_details
   
   self.primary_key = :id
   
   # returns a human readable string
   def to_s
-    return "#{year} #{make} #{model}"
+    if year.nil? or make.nil? or model.nil?
+      return "#{vin}"
+    else
+      split_vin = vin.scan(/.{1,9}/)
+      return "#{year} #{make} #{model} - #{split_vin[1]}"
+    end
   end
   
   # returns the raw JSON details from EMUNDS
   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['years'][0]['styles'][0]['name'] if @details
+      return @details.trim if @details
     rescue
       return nil
     end
@@ -49,21 +52,24 @@ class Vehicle < ActiveRecord::Base
   
   # returns the drive of the vehicle i.e. 2 wheel, 4 wheel, ect.
   def drive
-    return @details['drivenWheels'].to_s.upcase if @details
+    #todo fix this
+    #return @details.drive_type if @details
+    return nil
   end
   
   # returns the number of doors of the vehicle
   def doors
-    return @details['numOfDoors'] if @details
+    get_details if @details.nil?
+    return @details.doors if @details
   end
   
-  # Force Upper Case for VIN numbers
+  # Force Upper Case for make numbers
   def make=(val)
     # The to_s is in case you get nil/non-string
     write_attribute(:make, val.to_s.titleize)
   end
   
-  # Force Upper Case for VIN numbers
+  # Force Upper Case for model numbers
   def model=(val)
     # The to_s is in case you get nil/non-string
     write_attribute(:model, val.to_s.titleize)
@@ -71,8 +77,9 @@ class Vehicle < ActiveRecord::Base
   
   # Force Upper Case for VIN numbers
   def vin=(val)
-    # The to_s is in case you get nil/non-string
-    write_attribute(:vin, val.to_s.upcase)
+    #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
   
   # search for a vin
@@ -80,35 +87,14 @@ class Vehicle < ActiveRecord::Base
     where("vin LIKE ?", "%#{search}%")
   end
 	
-  private
-  
-  # init method to pull JSON details from Edmunds
-  def get_details
-    if self.vin?
-      begin
-        @details = JSON.parse get_decoder.full(self.vin)
-        raise @details['message'] if @details['status'] == "NOT_FOUND" 
-        raise @details['message'] if @details['status'] == "BAD_REQUEST"
-      rescue Exception => e
-        errors.add(:vin, e.message)
-      end
-    end
-  end
-  
-  # returns the Edmunds decoder service
-  def get_decoder
-    #TODO API Code via Settings
-    return decoder = Edmunds::Vin.new(API_KEY)
-  end
-  
   # decodes a vin and updates self
   def decode_vin
     get_details
     if @details
       begin
-        self.year = @details['years'][0]['year']
-        self.make = @details['make']['name']
-        self.model = @details['model']['name']
+        self.year = @details.year unless @details.year.nil?
+	self.make = @details.make unless @details.make.nil?
+	self.model = @details.model unless @details.model.nil?
       rescue Exception => e
         errors.add(:vin, e.message)
       end
@@ -116,15 +102,24 @@ class Vehicle < ActiveRecord::Base
     self.name = to_s
   end
   
-  # makes a squishvin
-  # https://api.edmunds.com/api/vehicle/v2/squishvins/#{vin}/?fmt=json&api_key=#{ENV['edmunds_key']}
-  def vin_squish
-    if not self.vin? or self.vin.size < 11
-      # this is to go ahead and query the API, letting them handle the error. :P
-      return '1000000000A'
+private
+  
+  # init method to pull JSON details from Edmunds
+  def get_details
+    if self.vin?
+      #validate the vin before calling a remote server
+      validation = NhtsaVin.validate(self.vin)
+      begin
+	#if the vin validation failed, raise an exception and exit
+	raise RuntimeError, validation.error unless validation.valid?
+	# query NHTSA for details on the vin
+        query = NhtsaVin.get(self.vin)
+        raise RuntimeError, query.error unless query.valid?
+        @details = query.response
+      rescue Exception => e
+        errors.add(:vin, e.message)
+      end
     end
-    v = self.vin[0,11]
-    return v.slice(0,8) + v.slice(9,11)
   end
   
 end

app/views/customers/_details.html.erb

@@ -1,39 +1,43 @@
 <table>
   <tbody>
     <tr>
-      <th>Customer</th>
-      <td><%= customer.name %></td>
-    </tr>
-    
-    <tr>
-      <th>Email</th>
+      <th><%=t(:label_email)%></th>
       <td><%= customer.email %></td>
     </tr>
     
     <tr>
-      <th>Primary Phone</th>
-      <td><%= customer.primary_phone %></td>
+      <th><%=t(:label_primary_phone)%></th>
+      <td><%= number_to_phone(customer.primary_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.primary_phone %></td>
     </tr>
     
     <tr>
-      <th>Mobile Phone</th>
-      <td><%= customer.mobile_phone %></td>
+      <th><%=t(:label_mobile_phone)%></th>
+      <td><%= number_to_phone(customer.mobile_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.mobile_phone %></td>
+    </tr>
+    
+     <tr>
+        <th><%=t(:label_billing_address)%></th>
+        <td><%= @billing_address %></td>
+    </tr>
+    
+     <tr>
+        <th><%=t(:label_shipping_address)%></th>
+        <td><%= @shipping_address %></td>
     </tr>
     
     <tr>
-      <th>Notes</th>
+        <th><%=t(:label_account_balance)%></th>
+        <td>$<%= customer.balance %></td>
+    </tr>
+    
+    <tr>
+      <th><%=t(:field_notes)%></th>
       <td><%= customer.notes %></td>
     </tr>
     
     <tr>
-        <th>Issues</th>
-        <td><%= customer.issues.count %></td>
-    </tr>
-    
-        <tr>
-      <td/>
       <td>
-        <%= button_to "Edit Customer", edit_customer_path(customer), method: :get%> 
+        <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
       </td>
     </tr>
   </tbody>

app/views/customers/_form.html.erb

@@ -5,35 +5,35 @@
       <%= form_for @customer do |f| %> 
        
         <div class="clearfix">
-          Display Name: 
+          <%=t(:label_display_name)%> 
           <div class="input">
             <%= f.text_field :name, :required => true %>
           </div>
         </div>
         
         <div class="clearfix">
-          Phone Number:
+          <%=t(:label_primary_phone)%>
           <div class="input">
             <%= f.telephone_field :primary_phone %>
           </div>
         </div>
         
        <div class="clearfix">
-          Mobile Phone Number:
+          <%=t(:label_mobile_phone)%>:
           <div class="input">
             <%= f.telephone_field :mobile_phone %>
           </div>
         </div>
         
         <div class="clearfix">
-          Email:
+          <%=t(:label_email)%>:
           <div class="input">
             <%= f.email_field :email %>
           </div>
         </div>
         
         <div class="clearfix">
-          Notes: 
+          <%=t(:field_notes)%>: 
           <div class="input">
             <p>  
               <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @customer.new_record? %>

app/views/customers/_search.html.erb

@@ -0,0 +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" %>
+<%= 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%>

app/views/customers/_sidebar.html.erb

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

app/views/customers/edit.html.erb

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

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/filter_vehicles_by_customer.js.erb

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

app/views/customers/index.html.erb

@@ -1,30 +1,24 @@
-<h1>Customers</h1> 
-<br/> 
-<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
-<%= text_field_tag :search, params[:search], placeholder: "Search Customers" %>
-<%= submit_tag "Search" %>
-<%= button_to "New Customer", new_customer_path, method: :get %>       
-<% end %>
-<br/>
+<h2><%=t(:field_customers)%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
 <% if @customers.present? %>
-  
-<br/>
-<% @customers.each do |c| %>
-  <div class="row">
-    <div class="span6 columns">
-      <%= link_to c, customer_path(c.id) %>
+  <br/>
+  <% @customers.each do |c| %>
+    <div class="row">
+      <div class="span6 columns">
+        <%= link_to c, customer_path(c.id) %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+
+<p><%=t(:label_matching)%> <%= @customers.count %> <%=t(:field_customers)%> </p>
 
 <div class="actions">
   <%= will_paginate @customers %>
 </div>
 
 <% else %>
-  <p>There are no customers containing the term(s) <%= params[:search] %>.</p>
+  <p><%=t(:label_no_customers)%> <%= params[:search] %>.</p>
 <% end %>
 
 <div>
-  <b>Last Sync: </b> <%= Qbo.last_sync %>
+  <%= render :partial => 'qbo/stats' %>
 </div>

app/views/customers/new.html.erb

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

app/views/customers/show.html.erb

@@ -1,7 +1,43 @@
-<h1>Customer #<%= @customer.id %></h1> 
-<br/> 
-<%= render :partial => 'customers/details', locals: {customer: @customer} %>
-<br/>
-<%= render :partial => 'vehicles/list' %>
-<br/>
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues} %>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2>
+  <br/>
+
+  <div class="subject">
+    <div><h4><%=t(:label_details)%>:</h4></div>
+  </div>
+
+  <div class="attributes">
+
+    <div class="splitcontent">
+
+      <div class="splitcontentleft">
+        <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+
+          <div class="splitcontent">
+            <div class="splitcontentleft">
+              <h4><%=t(:estimates)%>:</h4>
+              <%= render :partial => 'estimates/list', locals: {customer: @customer} %>
+            </div>
+
+            <div class="splitcontentleft">
+              <h4><%=t(:label_invoices)%>:</h4>
+              <%= render :partial => 'invoices/list', locals: {customer: @customer} %>
+            </div>
+          </div>
+
+      </div>
+      
+      <div class="splitcontentleft">
+        <h4><%=t(:field_vehicles)%>:</h4>
+        <%= render :partial => 'vehicles/list' %>
+          <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
+      </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>

app/views/customers/view.html.erb

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

app/views/estimates/_list.html.erb

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

app/views/estimates/_search.html.erb

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

app/views/estimates/_sidebar.html.erb

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

app/views/invoices/_list.html.erb

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

app/views/issues/_history.html.erb

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

app/views/issues/_list_simple.html.erb

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

app/views/payments/_form.html.erb

@@ -0,0 +1,42 @@
+<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

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

app/views/public/401.html.erb

@@ -1 +1 @@
-<%= flash.now[:error] = "Not Authorized" %>
+<%= flash.now[:error] = t(:label_401) %>

app/views/qbo/_issues_show_details.html.erb

@@ -0,0 +1,35 @@
+<div class="splitcontent"> 
+  <div class="splitcontentleft">
+    <div class="customer_id attribute">
+      <div class="label"><span><%=t(:field_customer)%></span>:</div>
+      <div class="value"><%= customer %></div>
+    </div>
+  
+    <div class="qbo_estimate_id attribute">
+      <div class="label"><span><%=t(:field_qbo_estimate)%></span>:</div>
+      <div class="value"><%= estimate_link %></div>
+    </div>
+         
+    <div class="qbo_invoice_id attribute">
+      <div class="label"><span><%=t(:field_qbo_invoice)%></span>:</div>
+      <div class="value"><%= invoice_link %></div>
+    </div>
+   </div>
+      
+  <div class="splitcontentleft">
+    <div class="vehicle attribute">
+      <div class="label"><span><%=t(:field_vehicle)%></span>:</div>
+      <div class="value"><%= vehicle %></div>
+    </div>
+       
+    <div class="vehicle_vin attribute">
+      <div class="label"><span><%=t(:field_vin)%></span>:</div>
+      <div class="value"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div>
+    </div>
+       
+    <div class="vehicle_notes attribute">
+      <div class="label"><span><%=t(:field_notes)%></span>:</div>
+      <div class="value"><%=notes%></div>
+    </div>
+  </div>
+</div>

app/views/qbo/_last_sync.html.erb

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

app/views/qbo/_settings.html.erb

@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+Copyright (c) 2020 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,22 +15,14 @@ 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: '<%= qbo_authenticate_url %>'});
+intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Setting.host_name %>/qbo/authenticate'});
 </script>
 
 <table >
   <tbody>
-    <tr>
-      <th>Edmunds API Key</th>
-      <td>
-        <input type="text" style="width:350px" id="settingsEdmundsAPIKey" 
-                           value="<%= settings['settingsEdmundsAPIKey'] %>" 
-                           name="settings[settingsEdmundsAPIKey]" >
-      </td>
-    </tr>
   
     <tr>
-      <th>Intuit QBO OAuth Consumer Key</th>
+      <th><%=t(:label_client_id)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
                            value="<%= settings['settingsOAuthConsumerKey'] %>" 
@@ -39,7 +31,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
     <tr>
-      <th>Intuit QBO OAuth Consumer Secret</th>
+      <th><%=t(:label_client_secret)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
                            value="<%= settings['settingsOAuthConsumerSecret'] %>"
@@ -48,7 +40,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
     
     <tr>
-      <th>Intuit QBO Webhook Token</th>
+      <th><%=t(:label_webhook_token)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsWebhookToken"
                            value="<%= settings['settingsWebhookToken'] %>"
@@ -57,21 +49,46 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
      <tr>
-       <th>Token Expires At</th>
-       <td><%= if Qbo.exists? then Qbo.first.token_expires_at end %>
-     </tr>
-
-     <tr>
-       <th>Reconnect Token At</th>
-       <td><%= if Qbo.exists? then Qbo.first.reconnect_token_at end  %>
+       <th><%=t(:label_oauth_expires)%></th>
+       <td><%= if Qbo.exists? then Qbo.first.expire end %>
      </tr>
 
   </tbody>
 </table>
 
 <br/>
-Note: You need to authenticate after saving your key and secret above
+<%=t(:label_oauth_note)%>
+<br/>
 <br/>
 
 <!-- this will display a button that the user clicks to start the flow -->
 <ipp:connectToIntuit></ipp:connectToIntuit>
+
+<br/>
+<br/>
+
+<div>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%>
+    </div>
+      
+    <div>
+        <b><%=t(:label_item_count)%>:</b> <%= QboItem.count %>
+    </div>
+      
+    <div>
+        <b><%=t(:label_employee_count)%>:</b> <%= QboEmployee.count %>
+    </div>
+    
+    <div>
+        <b><%=t(:label_invoice_count)%>:</b> <%= QboInvoice.count %>
+    </div>
+    
+    <div>
+        <b><%=t(:label_estimate_count)%>:</b> <%= QboEstimate.count %>
+    </div>
+      
+    <br/>
+    
+    <div>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
+</div>

app/views/qbo/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'customers/sidebar' %>
+<%= render :partial => 'estimates/sidebar' %>

app/views/qbo/_stats.html.erb

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

app/views/qbo/index.html.erb

@@ -11,32 +11,32 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 -->
 
 <body>
-    <h1> Redmine Quickbooks</h1>
+    <h1><%=t(:label_redmine_qbo)%></h1>
     
     <div>
-        <b>Customer Count:</b> <%= @customer_count.to_s%>
+        <b><%=t(:label_customer_count)%>:</b> <%= @customer_count.to_s%>
     </div>
       
     <div>
-        <b>Item Count:</b> <%= @qbo_item_count.to_s %>
+        <b><%=t(:label_item_count)%>:</b> <%= @qbo_item_count.to_s %>
     </div>
       
     <div>
-        <b>Employee Count:</b> <%= @qbo_employee_count.to_s %>
+        <b><%=t(:label_employee_count)%>:</b> <%= @qbo_employee_count.to_s %>
     </div>
     
     <div>
-        <b>Invoice Count:</b> <%= @qbo_invoice_count.to_s %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= @qbo_invoice_count.to_s %>
     </div>
     
     <div>
-        <b>Estimate Count:</b> <%= @qbo_estimate_count.to_s %>
+        <b><%=t(:label_estimate_count)%>:</b> <%= @qbo_estimate_count.to_s %>
     </div>
       
     <br/>
     
     <div>
-        <b>Last Sync: </b> <%= Qbo.last_sync %>
+        <b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>
     </div>
     
 </body>

app/views/vehicles/_details.html.erb

@@ -2,52 +2,34 @@
   <tbody>
   
     <tr>
-      <th>Customer</th>
-      <td><%= vehicle.customer.name %></td>
+      <th><%= t(:field_customer)%></th>
+      <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
     </tr>
   
     <tr>
-      <th>Vehicle</th>
+      <th><%= t(:field_vehicle) %></th>
       <td><%= vehicle.to_s %></td>
     </tr>
     
     <tr>
-      <th>VIN</th>
-      <td><%= vehicle.vin %></td>
+      <th><%= t(:field_vin) %></th>
+      <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
     </tr>
     
     <tr>
-      <th>Style</th>
-      <td><%= vehicle.style %></td>
-    </tr>
-    
-    <tr>
-      <th>Drive</th>
-      <td><%= vehicle.drive %></td>
-    </tr>
-    
-    <tr>
-      <th>Doors</th>
-      <td><%= vehicle.doors %></td>
-    </tr>
-  
-    <tr>
-      <th>Notes</th>
+      <th><%= t(:field_notes) %></th>
       <td><%= vehicle.notes %></td>
     </tr>
     
     <tr>
-        <th>Issues</th>
+        <th> <%= t(:issues) %> </th>
         <td><%= vehicle.issues.count %></td>
     </tr>
     
     <tr>
-      <td/>
       <td>
-      
-        <%= button_to "New Issue", new_issue_path(:vehicle_id => vehicle.id, :customer_id => vehicle.customer.id), method: :get%> 
-        <%= button_to "Edit", edit_vehicle_path(vehicle), method: :get%> 
-        <%= button_to "Delete", vehicle, method: :delete, data: {confirm: "You sure?"} %> 
+        <%= 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)} %> 
       </td>
     </tr>
   </tbody>

app/views/vehicles/_dropdown.html.erb

@@ -1,2 +0,0 @@
-<%= @f.collection_select :vehicle_id, @customer.vehicles.order(:year), :id, :vin, include_blank: true, :selected => @vehicle%>
-Partial Test

app/views/vehicles/_form.html.erb

@@ -4,55 +4,45 @@
 
       <%= form_for @vehicle do |f| %> 
         <div class="clearfix">
-          Customer: 
-          <div class="input">
-            <%= f.collection_select :customer_id, @customers, :id, :name, include_blank: true, :selected => @customer, :required => true%>
-            </div>
+		      <%=t(:field_customer)%>:
+	        <div class="input">
+            <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
+            <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
+          </div>
         </div>
         
         <div class="clearfix">
-          Year: 
+          <%=t(:label_year)%>: 
           <div class="input">
             <%= f.number_field :year %>
           </div>
         </div>
         
         <div class="clearfix">
-          Make:
+          <%=t(:label_make)%>:
           <div class="input">
             <%= f.text_field :make %>
           </div>
         </div>
         
         <div class="clearfix">
-          Model:
+          <%=t(:label_model)%>:
           <div class="input">
             <%= f.text_field :model %>
           </div>
         </div>
         
         <div class="clearfix">
-          VIN:
+          <%=t(:field_vin)%>:
           <div class="input">
-            <%= f.text_field :vin %>
+            <%= f.text_field :vin , :autofocus => true %>
           </div>
         </div>
         
         <div class="clearfix">
-          Notes: 
+          <%=t(:field_notes)%>: 
           <div class="input">
-            <p>  
-              <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @vehicle.new_record? %>
-              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@vehicle.new_record? ? nil : 'display:none') do %>
-              <%= f.text_area :notes,
-                    :cols => 60,
-                    :rows => 10,
-                    :accesskey => accesskey(:edit),
-                    :class => 'wiki-edit',
-                    :no_label => true %>
-              <% end %>
-            </p>
-            <%= wikitoolbar_for 'issue_description' %>
+            <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
           </div>
         </div>
         

app/views/vehicles/_list.html.erb

@@ -17,12 +17,12 @@
     <br/>
   <% end %>
 
-  <br/>
-
   <div class="actions">
     <%= will_paginate @vehicles %>
   </div>
 
+<p><%=t(:label_matching)%> <%=@vehicles.count%> <%=t(:field_vehicles) %> </p>
+
 <% else %>
-  <p>There are no vehicles containing the term(s) <%= params[:search] %>.</p>
+  <p><%=t(:label_no_vehicles)%> <%= params[:search] %>.</p>
 <% end %>

app/views/vehicles/_search.html.erb

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

app/views/vehicles/_vehicle.html.erb

@@ -0,0 +1 @@
+<option value="<%= vehicle.id %>"><%= vehicle.to_s.titleize %></option>

app/views/vehicles/edit.html.erb

@@ -1,3 +1,3 @@
-<h1>Edit Customer Vehicle</h1> 
+<h1><%=t(:label_edit_customer_vehicle)%></h1> 
 <br/> 
 <%= render :partial => 'vehicles/form' %>

app/views/vehicles/index.html.erb

@@ -1,10 +1,4 @@
-<h1>Customer Vehicles</h1> 
+<h2><%=t(:label_cusomer_vehicles)%> <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2> 
 <br/> 
 
-<%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
-<%= text_field_tag :search, params[:search], placeholder: "Search Vehicles by VIN" %>
-<%= submit_tag "Search" %>
-<%= button_to "New Vehicle", new_vehicle_path, method: :get %>
-<% end %>
-
 <%= render :partial => 'vehicles/list' %>

app/views/vehicles/new.html.erb

@@ -1,3 +1,3 @@
-<h1>New Customer Vehicle</h1> 
+<h2><%=t(:label_new_vehicle)%></h2> 
 <br/> 
 <%= render :partial => 'vehicles/form' %>

app/views/vehicles/show.html.erb

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

assets/javascripts/application.js

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

assets/javascripts/autocomplete-rails.js

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

config/initializers/edmunds.rb

@@ -1,3 +0,0 @@
-Edmunds::Api.configure do |config|
-  config.api_key = '2dheutzvhxs28dzukx5tgu47'
-end

config/locales/en.yml

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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:
 #
@@ -9,6 +9,7 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # English strings go here for Rails i18n
+# Usage t(:label)
 en:
   # my_label: "My label"
   field_customer: "Customer"
@@ -16,6 +17,63 @@ en:
   field_qbo_employee: "Employee"
   field_qbo_invoice: "Invoice"
   field_qbo_estimate: "Estimate" 
-  field_vehicles: "Vehicle"
+  field_vehicles: "Vehicles"
+  field_vehicle: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
+  field_qbo_billed: "Billed"
+  label_week: "Week"
+  label_search_estimates: "Search Estimates"
+  label_search: "Search"
+  label_estimates: "Estimates"
+  label_401: "Not Authorized"
+  warn_ru_sure: "You sure?"
+  label_delete: "Delete"
+  label_edit: "Edit"
+  label_year: "Year"
+  label_make: " Make"
+  label_model: "Model"
+  label_no_vehicles: "There are no vehicles containing the term(s)"
+  label_no_customers: "There are no customers containing the term(s)"
+  label_matching: "Matching "
+  label_search_vin: "Search Vehicles by VIN"
+  label_edit_customer_vehicle: "Edit Customer Vehicle"
+  label_cusomer_vehicles: "Customer Vehicles"
+  label_new_vehicle: "New Customer Vehicle"
+  label_open_issues: "Open Issues"
+  label_closed_issues: "Closed Issues"
+  label_sync: "Sync"
+  label_new_customer: "New Customer"
+  label_search_customers: "Search Customers"
+  label_customers: "Customers"
+  label_edit_customer: "Edit Customer"
+  label_email: "Email"
+  label_primary_phone: "Primary Phone"
+  label_mobile_phone: "Mobile Phone"
+  label_billing_address: "Billing Address"
+  label_shipping_address: "Shipping Address"
+  label_account_balance: "Account Balance"
+  label_balance_with_jobs: "Balance With Jobs"
+  label_display_name: "Display Name"
+  label_details: "Details"
+  label_customer_link_expires: "This customer link expires in"
+  label_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"
+  label_customer_count: "Customer Count"
+  label_invoice_count: "Invoice Count"
+  label_estimate_count: "Estimate Count"
+  label_item_count: "Item Count"
+  label_employee_count: "Employee Count"
+  label_client_id: "Intuit QBO OAuth2 Client ID"
+  label_client_secret: "Intuit QBO OAuth2 Client Secret"
+  label_webhook_token: "Intuit QBO Webhook Token"
+  label_oauth_expires: "OAuth2 Access Token Expires At"
+  label_oauth_note: "Note: You need to authenticate with Quickbooks after saving your key and secret above"
+  field_customers: "Customers"
+  label_no_estimates: "No Estimates"
+  label_no_invoices: "No Invoices"
+  label_invoices: "Invoices"

config/routes.rb

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

db/migrate/001_create_qbos.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQbos < ActiveRecord::Migration
+class CreateQbos < ActiveRecord::Migration[5.1]
   
   def change
     create_table :qbos do |t|

db/migrate/002_create_qbo_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboCustomers < ActiveRecord::Migration
+class CreateQboCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_customers, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/003_update_issues.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateIssues < ActiveRecord::Migration
+class UpdateIssues < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_customer, index: true
     add_reference :issues, :qbo_item, index: true

db/migrate/004_create_qbo_items.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboItems < ActiveRecord::Migration
+class CreateQboItems < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_items, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/005_create_qbo_employees.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboEmployees < ActiveRecord::Migration
+class CreateQboEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_employees, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/006_update_users.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateUsers < ActiveRecord::Migration
+class UpdateUsers < ActiveRecord::Migration[5.1]
   def change
     add_reference :users, :qbo_employee, index: true
   end

db/migrate/007_update_time_entries.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateTimeEntries < ActiveRecord::Migration
+class UpdateTimeEntries < ActiveRecord::Migration[5.1]
   def change
     add_column :time_entries, :qbo_billed, :boolean, :default => false
   end

db/migrate/008_create_qbo_estimates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboEstimates < ActiveRecord::Migration
+class CreateQboEstimates < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_estimates, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/009_update_qbos.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateQbos < ActiveRecord::Migration
+class UpdateQbos < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbos, :token, :qb_token
     rename_column :qbos, :secret, :qb_secret

db/migrate/010_update_issues_with_estimates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateIssuesWithEstimates < ActiveRecord::Migration
+class UpdateIssuesWithEstimates < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_estimate, index: true
   end

db/migrate/011_create_qbo_invoices.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboInvoices < ActiveRecord::Migration
+class CreateQboInvoices < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_invoices, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/012_update_issues_with_invoices.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateIssuesWithInvoices< ActiveRecord::Migration
+class UpdateIssuesWithInvoices< ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_invoice, index: true
   end

db/migrate/013_create_qbo_purchases.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateQboPurchases< ActiveRecord::Migration
+class CreateQboPurchases< ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_purchases, id: false do |t| 
       t.integer :id, :options => 'PRIMARY KEY' 

db/migrate/014_update_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateCustomers < ActiveRecord::Migration
+class UpdateCustomers < ActiveRecord::Migration[5.1]
   def change
     add_reference :qbo_customers, :qbo_purchase, index: true
   end

db/migrate/015_update_qbo_purchases.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateQboPurchases < ActiveRecord::Migration
+class UpdateQboPurchases < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbo_purchases, :customer_id, :qbo_customer_id
   end

db/migrate/016_create_vehicles.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateVehicles < ActiveRecord::Migration
+class CreateVehicles < ActiveRecord::Migration[5.1]
   
   def change  
     create_table :vehicles do |t| 

db/migrate/017_update_issues_with_vehicles.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateIssuesWithVehicles < ActiveRecord::Migration
+class UpdateIssuesWithVehicles < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :vehicles, index: true
   end

db/migrate/018_update_vehicles.rb

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

db/migrate/019_qbocustomers_to_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class QbocustomersToCustomers< ActiveRecord::Migration
+class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
   def change
     rename_table :qbo_customers, :customers
     rename_column :issues, :qbo_customer_id, :customer_id

db/migrate/020_update_qbos_time_stamp.rb

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

db/migrate/021_add_issues_qbo_invoices.rb

@@ -0,0 +1,27 @@
+#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 AddIssuesQboInvoices < ActiveRecord::Migration[5.1]
+  def self.up
+    create_table :issues_qbo_invoices, :id => false do |t|
+      t.references :issue
+      t.references :qbo_invoice
+    end
+    
+    add_index :issues_qbo_invoices, [:issue_id, :qbo_invoice_id], :unique => true
+    
+    # Now populate it with a SQL one-liner!
+    execute "insert into issues_qbo_invoices(issue_id, qbo_invoice_id) select id, qbo_invoice_id from issues"
+  end
+
+  def self.down
+    drop_table :issues_qbo_invoices
+  end
+end

db/migrate/022_update_issues_remove_invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,10 +8,8 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module ActiveSupport::Callbacks::ClassMethods
-  def without_callback(*args, &block)
-    skip_callback(*args)
-    yield
-    set_callback(*args)
+class UpdateIssuesRemoveInvoice < ActiveRecord::Migration[5.1]
+  def change
+    remove_reference :issues, :qbo_invoice
   end
 end

db/migrate/023_create_customer_tokens.rb

@@ -0,0 +1,19 @@
+#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 CreateCustomerTokens < ActiveRecord::Migration[5.1]
+  def change
+    create_table :customer_tokens do |t|
+      t.string :token
+      t.timestamp :expires_at
+      t.references :issue
+    end
+  end
+end

db/migrate/024_update_invoices_and_estimates.rb

@@ -0,0 +1,16 @@
+#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 UpdateInvoicesAndEstimates < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :qbo_invoices, :customer, index: true
+    add_reference :qbo_estimates, :customer, index: true
+  end
+end

db/migrate/025_update_projects.rb

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

db/migrate/026_create_line_items.rb

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

db/migrate/027_add_customers_phone_number.rb

@@ -0,0 +1,15 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 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 AddCustomersPhoneNumber < ActiveRecord::Migration[5.1]
+  def change
+    add_column :customers, :phone_number, :string
+  end
+end

db/migrate/028_add_customers_mobile_phone_number.rb

@@ -0,0 +1,15 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 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 AddCustomersMobilePhoneNumber < ActiveRecord::Migration[5.1]
+  def change
+    add_column :customers, :mobile_phone_number, :string
+  end
+end

db/migrate/029_update_qbos_types.rb

@@ -0,0 +1,17 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 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 UpdateQbosTypes < ActiveRecord::Migration[5.1]
+  
+  def change
+    change_column :qbos, :qb_token, :text
+    change_column :qbos, :qb_secret, :text
+  end
+end

db/migrate/030_update_qbos_token.rb

@@ -0,0 +1,17 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 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 UpdateQbosToken < ActiveRecord::Migration[5.1]
+  
+  def change
+    add_column :qbos, :token, :text
+    add_column :qbos, :expire, :datetime
+  end
+end

db/migrate/031_remove_qbos_keys.rb

@@ -0,0 +1,18 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 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 RemoveQbosKeys < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :qbos, :qb_secret
+    remove_column :qbos, :token_expires_at
+    remove_column :qbos, :reconnect_token_at
+    remove_column :qbos, :qb_token
+  end
+end

db/migrate/032_add_txn_dates.rb

@@ -0,0 +1,44 @@
+#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 AddTxnDates < ActiveRecord::Migration[5.1]
+  def change
+    add_column :qbo_invoices, :txn_date, :date
+    add_column :qbo_estimates, :txn_date, :date
+
+    reversible do |direction|
+      direction.up {
+        break unless Qbo.first
+
+        QboEstimate.reset_column_information
+        QboInvoice.reset_column_information
+
+        say "Sync Estimates"
+
+        QboEstimate.sync
+
+        say "Sync Invoices"
+
+        invoices = QboInvoice.get_base.all
+
+        invoices.each { |invoice|
+            # Load the invoice into the database
+            qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+            qbo_invoice.doc_number = invoice.doc_number
+            qbo_invoice.id = invoice.id
+            qbo_invoice.customer_id = invoice.customer_ref
+            qbo_invoice.txn_date = invoice.txn_date
+            qbo_invoice.save!
+        }
+      }
+    end
+  end
+
+end

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 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,17 +15,24 @@ Redmine::Plugin.register :redmine_qbo do
    require_dependency 'issues_save_hook_listener'
    require_dependency 'issues_show_hook_listener'
    require_dependency 'users_show_hook_listener'
+   require_dependency 'header_footer_hook_listener'
+   require_dependency 'projects_form_hook_listener'
+   require_dependency 'view_hook_listener'
 
    # Patches to the Redmine core.  Will not work in development mode
     require_dependency 'issue_patch'
+    require_dependency 'project_patch'
     require_dependency 'user_patch'
     require_dependency 'query_patch'
+    require_dependency 'time_entry_query_patch'
     require_dependency 'pdf_patch'
+    require_dependency 'attachments_controller_patch'
 
+    # About
     name 'Redmine Quickbooks Online plugin'
     author 'Rick Barrette'
     description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
-    version '0.1.0'
+    version '1.1.0'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -38,16 +45,24 @@ Redmine::Plugin.register :redmine_qbo do
     Issue.safe_attributes 'vehicles_id'
     User.safe_attributes 'qbo_employee_id'
     TimeEntry.safe_attributes 'qbo_billed'
+    Project.safe_attributes 'customer_id'
+    Project.safe_attributes 'vehicle_id'
 
     # We are playing in the sandbox 
     #Quickbooks.sandbox_mode = true
 
     # set per_page globally
-    WillPaginate.per_page = 10
+    WillPaginate.per_page = 20
+  
+    # 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 :add_payments, :payments => :new, :public => false
+    permission :view_vehicles, :payments => :new, :public => false
   
     # Register QBO top menu item
-    menu :top_menu, :qbo, { :controller => :qbo, :action => :index }, :caption => 'Quickbooks', :if => Proc.new { User.current.admin? }
+    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
     menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
-    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new { User.current.logged? }
     
 end

lib/attachments_controller_patch.rb

@@ -0,0 +1,38 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_dependency 'attachments_controller'
+
+module AttachmentsControllerPatch
+
+  def self.included(base) # :nodoc:
+    base.extend(ClassMethods)
+
+    base.send(:include, InstanceMethods)
+
+    # Same as typing in the class 
+    base.class_eval do
+      unloadable # Send unloadable so it will not be unloaded in development
+      
+      skip_before_action :read_authorize
+    end
+  end
+      
+  module ClassMethods
+    
+  end
+  
+  module InstanceMethods
+  
+  end
+end
+
+# Add module to AttachmentsController
+AttachmentsController.send(:include, AttachmentsControllerPatch)

lib/header_footer_hook_listener.rb

@@ -0,0 +1,19 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class HeaderFooterHookListener < Redmine::Hook::ViewListener
+
+  def view_layouts_base_html_head(context = {})
+    #nothing
+  end
+
+  def view_layouts_base_body_bottom(context = {})
+    return "<div id='qbo_footer' align='center'><b>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) 2016 rick barrette
+#Copyright (c) 2020 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -23,9 +23,11 @@ module IssuePatch
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
       belongs_to :customer, primary_key: :id
-      belongs_to :qbo_item, primary_key: :id
+      belongs_to :customer_token, primary_key: :id
       belongs_to :qbo_estimate, primary_key: :id
-      belongs_to :qbo_invoice, primary_key: :id
+      has_and_belongs_to_many :qbo_invoices
+        #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
+  
       belongs_to :vehicle, primary_key: :id
     end
     
@@ -37,6 +39,71 @@ module IssuePatch
   
   module InstanceMethods
     
+    # Create billable time entries
+    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_hours ||= spent_time.sum(:hours) || 0
+      
+      if spent_hours > 0 then
+        
+        # Prepare to create a new Time Activity
+        time_service = Qbo.get_base(:time_activity)
+        item_service = Qbo.get_base(:item)
+        time_entry = Quickbooks::Model::TimeActivity.new
+  
+        # Lets total up each activity before billing.
+        # This will simpify the invoicing with a single billable time entry per time activity
+        h = Hash.new(0)
+        spent_time.each do |entry|
+          h[entry.activity.name] += entry.hours
+          # update time entries billed status
+          entry.qbo_billed = true
+          entry.save
+        end
+        
+        # Now letes upload our totals for each activity as their own billable time entry
+        h.each do |key, val|
+          
+          # Convert float spent time to hours and minutes
+          hours = val.to_i
+          minutesDecimal = (( val - hours) * 60)
+          minutes = minutesDecimal.to_i
+
+          # Lets match the activity to an qbo item
+          item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
+          next if item.nil?
+          
+          # Create the new billable time entry and upload it
+          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
+          # TODO entry.user.qbo_employee.id
+          time_entry.employee_id = assigned_to.qbo_employee_id 
+          time_entry.customer_id = customer_id
+          time_entry.billable_status = "Billable"
+          time_entry.hours = hours
+          time_entry.minutes = minutes
+          time_entry.name_of = "Employee"
+          time_entry.txn_date = Date.today
+          time_entry.hourly_rate = item.unit_price
+          time_entry.item_id = item.id 
+          time_entry.start_time = start_date
+          time_entry.end_time = Time.now
+          time_service.create(time_entry)
+        end
+      end
+    end
+  end
+  
+  # Create a shareable link for a customer
+  def share_token
+    CustomerToken.create(:expires_at => Time.now + 1.month, :issue_id => id)
   end
   
 end