Version 1.1.3

This stuff isn't really used for anything

LICENSE

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

README.md

@@ -2,45 +2,45 @@
 
 A plugin for Redmine to connect to Quickbooks Online
 
-The goal of this project is to allow Redmine to connect with Quickbooks Online to create `Time Activity Entries` for completed work when an Issue is closed.
+The goal of this project is to allow Redmine to connect with Quickbooks Online to create Time Activity Entries for billable hours loged when an Issue is closed.
 
 #### Disclaimer
 
-Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable
+Note: Although the core functionality is complete, this project is still under development & the master branch may be unstable. Tags should be stable and are recommended
 
-Use tags Version 1.0.0 & up for Redmine 4+ and Version 0.8.1 for Redine 3
+Use tags Version 1.0.0+ 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. 
+* Issues can be assigned to a Customer via drop down in the edit Issue form
+  - Once a customer is attached to an Issue, you can attach an Estimate to the issue via a drop down menu
+* Employee is assigned to a user via a drop down in the user admistration page.
+* IF an Issue has been assined a Customer when an Issue is closed the following will happen:
+  - 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
+    + The Time Activity names are used to dynamically lookup Items in Quickbooks.
+    + IF there isn't any Items that match the Activity name it will be skipped, and will not be billed to the Customer 
+  - Labor Rates are set by corresponding the Item in Quickbooks
+* Customers Can be created via the New Customer Page
+  - Customers can be searched by name or phone number
+  - Basic information for the Customer can be viewed/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
+  - 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
 
 1. To install, clone this repo into your plugin folder
 
   `git clone git@github.com:rickbarrette/redmine_qbo.git` 
+  then
+  `git checkout <tag>`
   
 2. Migrate your database
 
@@ -54,27 +54,23 @@ Use tags Version 1.0.0 & up for Redmine 4+ and Version 0.8.1 for Redine 3
 
 ## Usage
 
-  To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
+  To enable automatic Time Activity entries for an Issue , you need only to assign a Customer to an Issue via drop downs in the issue creation/update form.
 
 Note: After the inital synchronization, this plugin will recieve push notifications via Intuit's webhook service.
 
 ## TODO
-  * Abiltiy to add line items to a ticket in a dynamic table so they can be added to the invoice upon closing of the issue
-  * Customer Deletion
-  * Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue. 
+  * Customer link option to allow for temporary sharing of an issue
   * Add Setting for Sandbox Mode
-  * Refactor Models prefixed with Qbo...
-  * Seperate Vehicles into a seperate plugin
-  * Make HTML Pretty 
+  * Seperate Vehicles into a seperate plugin (I use redmine for my automotive shop management 😉)
+  * Make HTML Pretty (It's ugly right now but it works)
   * Intergrate Customer Search into Redmine Search
-  * Fix Issue sort by Customer
-  * MORE Stuff...
+  * MORE Stuff as I make it up...
 
 ## License
 
 The MIT License (MIT)
 
-Copyright (c) 2022 rick barrette
+Copyright (c) 2016 - 2022 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app/controllers/customers_controller.rb

@@ -48,13 +48,13 @@ class CustomersController < ApplicationController
   # getter method for a customer's invoices
   # used for customer autocomplete field / issue form
   def filter_invoices_by_customer
-    @filtered_invoices = QboInvoice.all.where(customer_id: params[:selected_customer])
+    @filtered_invoices = Invoice.all.where(customer_id: params[:selected_customer])
   end
 
   # getter method for a customer's estimates
   # used for customer autocomplete field / issue form
   def filter_estimates_by_customer
-    @filtered_estimates = QboEstimate.all.where(customer_id: params[:selected_customer])
+    @filtered_estimates = Estimate.all.where(customer_id: params[:selected_customer])
   end
 
   # display a list of all customers
@@ -93,7 +93,7 @@ class CustomersController < ApplicationController
       @billing_address = address_to_s(@customer.billing_address)
       @shipping_address = address_to_s(@customer.shipping_address)
       @closed_issues = (@issues - @issues.open)
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -102,7 +102,7 @@ class CustomersController < ApplicationController
   def edit
     begin
       @customer = Customer.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -118,7 +118,7 @@ class CustomersController < ApplicationController
         redirect_to edit_customer_path
         flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
       end
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -129,7 +129,24 @@ class CustomersController < ApplicationController
       Customer.find_by_id(params[:id]).destroy
       flash[:notice] = "Customer deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    rescue 
+      render_404
+    end
+  end
+
+  # creates new customer view tokens, removes expired tokens & redirects to newly created customer view with new token.
+  def share
+
+    Thread.new do
+      logger.debug "Removing expired customer tokens"
+      CustomerToken.remove_expired_tokens
+      ActiveRecord::Base.connection.close
+    end
+
+    begin
+      issue = Issue.find_by_id(params[:id])
+      redirect_to view_path issue.share_token.token
+    rescue
       render_404
     end
   end

app/controllers/estimate_controller.rb

@@ -18,8 +18,8 @@ class EstimateController < ApplicationController
   # Downloads and forwards the estimate pdf
   #
   def show
-    e = QboEstimate.find_by_id(params[:id]) if params[:id]
-    e = QboEstimate.find_by_doc_number(params[:search]) if params[:search]
+    e = Estimate.find_by_id(params[:id]) if params[:id]
+    e = Estimate.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"
@@ -32,8 +32,8 @@ class EstimateController < ApplicationController
   # 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]
+    e = Estimate.find_by_doc_number(params[:id]) if params[:id]
+    e = Estimate.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"

app/controllers/invoice_controller.rb

@@ -19,9 +19,13 @@ class InvoiceController < ApplicationController
   # Downloads and forwards the invoice pdf
   #
   def show
-    base = QboInvoice.get_base
+    begin
+      base = Invoice.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"
+    rescue
+      redirect_to :back, :flash => { :error => "Invoice not found" }
+    end
   end
 end

app/controllers/line_items_controler.rb

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

app/controllers/payments_controller.rb

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

@@ -15,32 +15,19 @@ class QboController < ApplicationController
   
   include AuthHelper
   
-  before_action :require_user, :except => :qbo_webhook
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
+  before_action :require_user, :except => :webhook
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
 
   def allowed_params
     params.permit(:code, :state, :realmId, :id)
   end
 
-  #
-  # Called when the QBO Top Menu us shown
-  #
-  def index
-    @qbo = Qbo.first
-    @customer_count = Customer.count
-    @qbo_item_count = QboItem.count
-    @qbo_employee_count = QboEmployee.count
-    @qbo_invoice_count = QboInvoice.count
-    @qbo_estimate_count = QboEstimate.count
-  end
-
   #
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
     oauth2_client = Qbo.get_client
     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
@@ -52,7 +39,6 @@ class QboController < ApplicationController
     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)
         
@@ -69,7 +55,7 @@ class QboController < ApplicationController
         qbo.expire = 1.hour.from_now.utc
         
         if qbo.save!
-          redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+          redirect_to sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
         else
           redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
         end
@@ -90,7 +76,7 @@ class QboController < ApplicationController
   end
   
   # Quickbooks Webhook Callback
-  def qbo_webhook
+  def webhook
 
     logger.info "Quickbooks is calling webhook"
     
@@ -114,9 +100,6 @@ class QboController < ApplicationController
         id = entity['id'].to_i
         name = entity['name']
        
-        # TODO rename all other models!
-        name.prepend("Qbo") if not name.eql? "Customer"
-       
         logger.debug "Casting #{name.constantize} to obj"
 
         # Magicly initialize the correct class
@@ -161,10 +144,10 @@ class QboController < ApplicationController
     Thread.new do
       if Qbo.exists?
         Customer.sync
-        QboInvoice.sync
+        Invoice.sync
         QboItem.sync
-        QboEmployee.sync
-        QboEstimate.sync
+        Employee.sync
+        Estimate.sync
         
         # Record the last sync time
         Qbo.update_time_stamp

app/controllers/vehicles_controller.rb

@@ -64,7 +64,7 @@ class VehiclesController < ApplicationController
       @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
       @issues = @vehicle.issues.order(id: :desc)
       @closed_issues = (@issues - @issues.open)
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -74,7 +74,7 @@ class VehiclesController < ApplicationController
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
       @customer = @vehicle.customer
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -92,7 +92,7 @@ class VehiclesController < ApplicationController
       end
       #show any errors anyways
       flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -103,7 +103,7 @@ class VehiclesController < ApplicationController
       Vehicle.find_by_id(params[:id]).destroy
       flash[:notice] = "Vehicle deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end

app/models/customer.rb

@@ -12,12 +12,11 @@ class Customer < ActiveRecord::Base
   unloadable
   
   has_many :issues
-  has_many :qbo_purchases
-  has_many :qbo_invoices
-  has_many :qbo_estimates
+  has_many :purchases
+  has_many :invoices
+  has_many :estimates
   has_many :vehicles
   
-  #attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone, :phone_number
   validates_presence_of :id, :name
   
   self.primary_key = :id
@@ -149,16 +148,16 @@ class Customer < ActiveRecord::Base
     #end
     
     customers.each do |customer|
-      qbo_customer = Customer.find_or_create_by(id: customer.id)
+      customer = Customer.find_or_create_by(id: customer.id)
       if customer.active?
-        if not qbo_customer.name.eql? customer.display_name
-          qbo_customer.name = customer.display_name
-          qbo_customer.id = customer.id
-          qbo_customer.save_without_push
+        if not customer.name.eql? customer.display_name
+          customer.name = customer.display_name
+          customer.id = customer.id
+          customer.save_without_push
         end
       else
-        if not qbo_customer.new_record?
-          qbo_customer.delete
+        if not customer.new_record?
+          customer.delete
         end
       end
     end
@@ -176,16 +175,16 @@ class Customer < ActiveRecord::Base
     service = Qbo.get_base(:customer)
 
     customer = service.fetch_by_id(id)
-    qbo_customer = Customer.find_or_create_by(id: customer.id)
+    customer = Customer.find_or_create_by(id: customer.id)
     if customer.active?
-      if not qbo_customer.name.eql? customer.display_name
-        qbo_customer.name = customer.display_name
-        qbo_customer.id = customer.id
-        qbo_customer.save_without_push
+      if not customer.name.eql? customer.display_name
+        customer.name = customer.display_name
+        customer.id = customer.id
+        customer.save_without_push
       end
     else
-      if not qbo_customer.new_record?
-        qbo_customer.delete
+      if not customer.new_record?
+        customer.delete
       end
     end
   end

app/models/customer_token.rb

@@ -11,13 +11,17 @@
 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
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE__' + SecureRandom.uuid
   
   def generate_token
     self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
   end
+
+  def remove_expired_tokens
+    CustomerToken.where("expires_at < ?", Time.now).destroy_all
+  end
+
 end

app/models/employee.rb

@@ -8,10 +8,9 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class QboEmployee < ActiveRecord::Base
+class Employee < ActiveRecord::Base
   unloadable
   has_many :users
-  #attr_accessible :name
   validates_presence_of :id, :name
   
   def self.get_base
@@ -24,19 +23,19 @@ class QboEmployee < ActiveRecord::Base
     transaction do
       # Update the item table
       employees.each { |employee|
-        qbo_employee = 	find_or_create_by(id: employee.id)
-        qbo_employee.name = employee.display_name
-        qbo_employee.id = employee.id
-        qbo_employee.save!
+        employee = 	find_or_create_by(id: employee.id)
+        employee.name = employee.display_name
+        employee.id = employee.id
+        employee.save!
       }
     end
   end
 
   def self.sync_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
-    qbo_employee.save!
+    employee = find_or_create_by(id: employee.id)
+    employee.name = employee.display_name
+    employee.id = employee.id
+    employee.save!
   end
 end

app/models/estimate.rb

@@ -8,12 +8,11 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class QboEstimate < ActiveRecord::Base
+class Estimate < ActiveRecord::Base
   unloadable
   
   has_and_belongs_to_many :issues
   belongs_to :customer 
-  #attr_accessible :doc_number, :id
   validates_presence_of :doc_number, :id
   self.primary_key = :id
   
@@ -44,26 +43,26 @@ class QboEstimate < ActiveRecord::Base
   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.txn_date = estimate.txn_date
-    qbo_estimate.save!
+    estimate = find_or_create_by(id: id)
+    estimate.doc_number = estimate.doc_number
+    estimate.txn_date = estimate.txn_date
+    estimate.save!
   end
   
   # process an estimate into the database
   def self.process_estimate(estimate)
     logger.info "Processing estimate #{estimate.id}"
-    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!
+    estimate = find_or_create_by(id: estimate.id)
+    estimate.doc_number = estimate.doc_number
+    estimate.customer_id = estimate.customer_ref.value
+    estimate.id = estimate.id
+    estimate.txn_date = estimate.txn_date
+    estimate.save!
   end
 
   # download the pdf from quickbooks
   def pdf
-    base = QboEstimate.get_base
+    base = Estimate.get_base
     estimate = base.fetch_by_id(id)
     return base.pdf(estimate)
   end

app/models/invoice.rb

@@ -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 QboInvoice < ActiveRecord::Base
+class Invoice < ActiveRecord::Base
   unloadable
   has_and_belongs_to_many :issues
   belongs_to :customer 
@@ -59,10 +59,10 @@ class QboInvoice < ActiveRecord::Base
     
     logger.debug "Attaching invoice #{invoice.id} to issue #{issue.id}"
     
-    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+    invoice = Invoice.find_or_create_by(id: invoice.id)
 
-    unless issue.qbo_invoices.include?(qbo_invoice)
-      issue.qbo_invoices << qbo_invoice
+    unless issue.invoices.include?(invoice)
+      issue.invoices << invoice
       issue.save!
     end
     
@@ -74,12 +74,12 @@ class QboInvoice < ActiveRecord::Base
     logger.info "Processing invoice #{invoice.id}"
 
     # 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!
+    invoice = Invoice.find_or_create_by(id: invoice.id)
+    invoice.doc_number = invoice.doc_number 
+    invoice.id = invoice.id
+    invoice.customer_id = invoice.customer_ref
+    invoice.txn_date = invoice.txn_date
+    invoice.save!
 
     # Scan the private notes for hashtags and attach to the applicable issues
     if not invoice.private_note.nil?
@@ -105,7 +105,7 @@ class QboInvoice < ActiveRecord::Base
   # TODO maybe add a cf_sync_confict flag to invoices
   def self.compare_custom_fields(issue, invoice)
     logger.debug "Comparing custom fields"
-    # TODO break if QboInvoice.find(invoice.id).cf_sync_confict
+    # TODO break if Invoice.find(invoice.id).cf_sync_confict
     is_changed = false
     
     # update the invoive custom fields with infomation from the issue if available
@@ -160,7 +160,7 @@ class QboInvoice < ActiveRecord::Base
       # Do nothing, probaly custome field sync confict on the invoice. 
       # This is a problem with how it's billed
       # TODO Add notes in memo area
-      # TODO flag QboInvoice.cf_sync_confict here
+      # TODO flag Invoice.cf_sync_confict here
       logger.error "Failed to update invoice"
     end
   end

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,7 +10,6 @@
 
 class Qbo < ActiveRecord::Base
   unloadable
-  #validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
   validates_presence_of :token, :company_id, :expire
   serialize :token
 
@@ -29,7 +28,6 @@ class Qbo < ActiveRecord::Base
     return OAuth2::Client.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, oauth_params)
   end
   
-
   #
   # Getter for oauth consumer
   #

app/models/qbo_purchase.rb

@@ -1,47 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2022 rick barrette
-#
-#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-#
-#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-#
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class QboPurchase < ActiveRecord::Base
-  unloadable
-  belongs_to :issues
-  belongs_to :qbo_customer
-  #attr_accessible :description
-  validates_presence_of :id, :line_id, :description, :qbo_customer_id
-  
-  def self.get_base
-    Qbo.get_base(:purchase)
-  end
-
-  def get_purchase(id)
-    get_base.find_by_id(id)
-  end
-
-  def self.sync
-   QboPurchase.get_base.all.each { |purchase|
-      
-      purchase.line_items.all? { |line_item|
-        
-        detail = line_item.account_based_expense_line_detail ? line_item.account_based_expense_line_detail : line_item.item_based_expense_line_detail
-        
-        if detail.billable_status =  "Billable"
-            qbo_purchase = find_or_create_by(id: purchase.id)
-            qbo_purchase.line_id = line_item.id
-            qbo_purchase.description = line_item.description
-            qbo_purchase.qbo_customer_id = detail.customer_ref
-            
-            #TODO attach to issues
-            #qbo_purchase.issue_id = Issue.find_by_invoice()
-            
-            qbo_purchase.save
-        end
-      }
-    }
-  end
-end

app/models/vehicle.rb

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

app/views/customers/_details.html.erb

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

app/views/customers/_search.html.erb

@@ -3,4 +3,4 @@
     <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>
-<%= button_to t(:label_sync), qbo_sync_path, method: :get%>
+<%= button_to(t(:label_sync), qbo_sync_path, method: :get) if User.current.admin?%>

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/show.html.erb

@@ -1,15 +1,12 @@
 <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="issue">
 
     <div class="splitcontent">
 
       <div class="splitcontentleft">
+
+        <h4><%=t(:label_details)%>:</h4>
+
         <%= render :partial => 'customers/details', locals: {customer: @customer} %>
 
         <div class="splitcontent">
@@ -29,15 +26,17 @@
       <div class="splitcontentleft">
         <h4><%=t(:field_vehicles)%>:</h4>
         <%= render :partial => 'vehicles/list' %>
+        <div style="float: right;">
           <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
         </div>
       </div>
-
-    <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>
 
   </div>
+
+<br/>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+
+<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>

app/views/estimates/_list.html.erb

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

app/views/invoices/_list.html.erb

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

app/views/issues/_form_hook.html.erb

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

app/views/issues/_show_details.html.erb

@@ -5,13 +5,13 @@
       <div class="value"><%= customer %></div>
     </div>
   
-    <div class="qbo_estimate_id attribute">
-      <div class="label"><span><%=t(:field_qbo_estimate)%></span>:</div>
+    <div class="estimate_id attribute">
+      <div class="label"><span><%=t(:field_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="invoice_id attribute">
+      <div class="label"><span><%=t(:field_invoice)%></span>:</div>
       <div class="value"><%= invoice_link %></div>
     </div>
    </div>

app/views/payments/_form.html.erb

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

app/views/payments/new.html.erb

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

app/views/qbo/_settings.html.erb

@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2020 rick barrette
+Copyright (c) 2022 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -24,7 +24,10 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     <tr>
       <th><%=t(:label_client_id)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerKey" 
           value="<%= settings['settingsOAuthConsumerKey'] %>" 
           name="settings[settingsOAuthConsumerKey]" >
       </td>
@@ -33,7 +36,10 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     <tr>
       <th><%=t(:label_client_secret)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsOAuthConsumerSecret"
           value="<%= settings['settingsOAuthConsumerSecret'] %>"
           name="settings[settingsOAuthConsumerSecret]" >
       </td>
@@ -42,7 +48,10 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     <tr>
       <th><%=t(:label_webhook_token)%></th>
       <td>
-        <input type="text" style="width:350px" id="settingsWebhookToken"
+        <input 
+          type="text" 
+          style="width:350px" 
+          id="settingsWebhookToken"
           value="<%= settings['settingsWebhookToken'] %>"
           name="settings[settingsWebhookToken]" >
       </td>
@@ -72,23 +81,19 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Settin
     </div>
       
     <div>
-        <b><%=t(:label_item_count)%>:</b> <%= QboItem.count %>
+        <b><%=t(:label_employee_count)%>:</b> <%= Employee.count %>
     </div>
     
     <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= QboEmployee.count %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= Invoice.count %>
     </div>
     
     <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= QboInvoice.count %>
-    </div>
-    
-    <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= QboEstimate.count %>
+        <b><%=t(:label_estimate_count)%>:</b> <%= Estimate.count %>
     </div>
       
     <br/>
     
     <div>
-        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to t(:label_sync_now), qbo_sync_path %>
 </div>

app/views/qbo/authenticate.html.erb

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

app/views/qbo/index.html.erb

@@ -1,42 +0,0 @@
-<!--
-The MIT License (MIT)
-
-Copyright (c) 2016 rick barrette
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--->
-
-<body>
-    <h1><%=t(:label_redmine_qbo)%></h1>
-    
-    <div>
-        <b><%=t(:label_customer_count)%>:</b> <%= @customer_count.to_s%>
-    </div>
-      
-    <div>
-        <b><%=t(:label_item_count)%>:</b> <%= @qbo_item_count.to_s %>
-    </div>
-      
-    <div>
-        <b><%=t(:label_employee_count)%>:</b> <%= @qbo_employee_count.to_s %>
-    </div>
-    
-    <div>
-        <b><%=t(:label_invoice_count)%>:</b> <%= @qbo_invoice_count.to_s %>
-    </div>
-    
-    <div>
-        <b><%=t(:label_estimate_count)%>:</b> <%= @qbo_estimate_count.to_s %>
-    </div>
-      
-    <br/>
-    
-    <div>
-        <b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>
-    </div>
-    
-</body>

app/views/qbo/sync.html.erb

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

app/views/vehicles/_details.html.erb

@@ -1,3 +1,8 @@
+<div class="issue">
+  <div class="splitcontent">
+    <div class="splitcontentleft">
+      <h4><%=t(:label_details)%>:</h4>
+      
       <table>
         <tbody>
 
@@ -16,16 +21,25 @@
             <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
           </tr>
           
-    <tr>
-      <th><%= t(:field_notes) %></th>
-      <td><%= vehicle.notes %></td>
-    </tr>
-    
-    <tr>
-      <td>
-        <%= 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>
+          <th><%= t(:label_trim) %></th>
+            <td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
           </tr>
         </tbody>
       </table>
+      
+    </div>
+
+    <div class="splitcontentleft">
+
+      <h4><%=t(:field_notes)%>:</h4>
+        <td><%= vehicle.notes %></td>
+      </tr>
+
+    </div>
+  </div>
+</div>
+
+<div style="float: right;">
+  <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
+  <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
+</div>

app/views/vehicles/_list.html.erb

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

app/views/vehicles/show.html.erb

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

config/locales/en.yml

@@ -9,19 +9,18 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # English strings go here for Rails i18n
-# Usage t(:label)
+# Usage I18n.t(:label)
 en:
-  # my_label: "My label"
   field_customer: "Customer"
-  field_qbo_item: "Item"
-  field_qbo_employee: "Employee"
-  field_qbo_invoice: "Invoice"
-  field_qbo_estimate: "Estimate" 
+  field_item: "Item"
+  field_employee: "Employee"
+  field_invoice: "Invoice"
+  field_estimate: "Estimate" 
   field_vehicles: "Vehicles"
   field_vehicle: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
-  field_qbo_billed: "Billed"
+  field_billed: "Billed"
   label_week: "Week"
   label_search_estimates: "Search Estimates"
   label_search: "Search"
@@ -57,9 +56,7 @@ en:
   label_display_name: "Display Name"
   label_details: "Details"
   label_customer_link_expires: "This customer link expires in"
-  label_new_payment: "New Payment"
   label_amount: "Amount"
-  label_payment_method: "Payment Method"
   label_deposit_into: "Deposit to Account"
   label_last_sync: "Last Sync"
   label_redmine_qbo: "Redmine Quickbooks"
@@ -78,3 +75,16 @@ en:
   label_no_invoices: "No Invoices"
   label_invoices: "Invoices"
   label_load_customer: "Load Customer"
+  label_door: "Door"
+  label_trim: "Trim"
+  label_bill_time: "Bill Time"
+  label_share: "Share"
+  label_sync_now: "Sync Now"
+  label_invoice_404: "Invoice not found"
+  label_estimate_404: "Estimate not found"
+  label_connected: "Successfully connected to Quickbooks"
+  label_error: "Error"
+  label_billed_success: "Successfully Billed "
+  label_billing_error: "Cannot bill without a customer assigned"
+  label_qbo_sync_success: "Successfully synced to Quickbooks"
+  

config/routes.rb

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

db/migrate/033_update_vehicles_trim.rb

@@ -8,27 +8,23 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class LineItem < ActiveRecord::Base
+class UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
+  def change
+    add_column :vehicles, :doors, :text
+    add_column :vehicles, :trim, :text
 
-  unloadable
+    reversible do |direction|
+      direction.up {
 
-  belongs_to :issue
+        # Update local vehicle database by forcing a save, look at before_save
+        vehicles = Vehicle.all
+        vehicles.each { |vehicle|
+            vehicle.save!
+        }
 
-  #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
+  end
 
-    return invoice
-  end
 end

db/migrate/034_remove_qbo_items.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,30 +8,10 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class 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)
+class RemoveQboItems < ActiveRecord::Migration[5.1]
+  def change
+    drop_table :qbo_items
+    drop_table :qbo_purchases
+    drop_table :line_items
   end
-  
-  def save!
-    save
-  end
-
-  # Dummy stub to make validtions happy.
-  def update_attribute
-  end
-
 end

db/migrate/035_drop_qbo_prefix.rb

@@ -8,40 +8,15 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class QboItem < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  #attr_accessible :name
-  validates_presence_of :id, :name
+class DropQboPrefix < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :qbo_invoices, :invoices
+    rename_table :qbo_estimates, :estimates
+    rename_table :qbo_employees, :employees
+    rename_table :issues_qbo_invoices, :invoices_issues
     
-  self.primary_key = :id
-
-  def self.get_base
-    Qbo.get_base(:item)
+    rename_column :issues, :qbo_estimate_id, :estimate_id
+    rename_column :users, :qbo_employee_id, :employee_id
+    rename_column :invoices_issues, :qbo_invoice_id, :invoice_id
   end 
-  
-  def self.sync 
-    last = Qbo.first.last_sync
-
-    query = "SELECT Id, Name FROM Item WHERE Type = 'Service' "
-    query << " AND  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last 
-   
-    if count == 0
-      items = get_base.all
-    else
-      items = get_base.query(query)
-    end
-
-    unless items.count = 0
-      items.find_by(:type, "Service").each { |i|
-        qbo_item = QboItem.find_or_create_by(id: i.id)
-        qbo_item.name = i.name
-        qbo_item.id = i.id
-        qbo_item.save
-      }
-    end
-      
-#    QboItem.where.not(items.map(&:id)).destroy_all
-  end
-  
 end

init.rb

@@ -22,7 +22,7 @@ Redmine::Plugin.register :redmine_qbo do
   name 'Redmine Quickbooks Online plugin'
   author 'Rick Barrette'
   description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
-  version '1.1.1'
+  version '1.1.3'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'http://rickbarrette.org'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -30,12 +30,12 @@ Redmine::Plugin.register :redmine_qbo do
   
   # Add safe attributes for core models
   Issue.safe_attributes 'customer_id'
-  Issue.safe_attributes 'qbo_item_id'
-  Issue.safe_attributes 'qbo_estimate_id'
-  Issue.safe_attributes 'qbo_invoice_id'
+  Issue.safe_attributes 'item_id'
+  Issue.safe_attributes 'estimate_id'
+  Issue.safe_attributes 'invoice_id'
   Issue.safe_attributes 'vehicles_id'
-  User.safe_attributes 'qbo_employee_id'
-  TimeEntry.safe_attributes 'qbo_billed'
+  User.safe_attributes 'employee_id'
+  TimeEntry.safe_attributes 'billed'
   Project.safe_attributes 'customer_id'
   Project.safe_attributes 'vehicle_id'
 
@@ -48,9 +48,7 @@ Redmine::Plugin.register :redmine_qbo do
   # Permissions for security
   permission :view_customers, :customers => :index, :public => false
   permission :add_customers, :customers => :new, :public => false
-  permission :view_payments, :payments => :index, :public => false
-  permission :add_payments, :payments => :new, :public => false
-  permission :view_vehicles, :payments => :new, :public => false
+  permission :view_vehicles, :vehicles => :new, :public => false
 
   # Register top menu items
   menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}

lib/header_footer_hook_listener.rb

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

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 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:
 #
@@ -24,10 +24,8 @@ module IssuePatch
       unloadable # Send unloadable so it will not be unloaded in development
       belongs_to :customer, primary_key: :id
       belongs_to :customer_token, primary_key: :id
-      belongs_to :qbo_estimate, primary_key: :id
-      has_and_belongs_to_many :qbo_invoices
-        #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
-  
+      belongs_to :estimate, primary_key: :id
+      has_and_belongs_to_many :invoices
       belongs_to :vehicle, primary_key: :id
     end
     
@@ -43,13 +41,12 @@ module IssuePatch
     def bill_time
      
       # Check to see if we have everything we need to bill the customer
-      #return unless status.is_closed?
       return if assigned_to.nil?
       return unless Qbo.first 
       return unless customer 
 
       # Get unbilled time entries
-      spent_time = time_entries.where(qbo_billed: [false, nil])
+      spent_time = time_entries.where(billed: [false, nil])
       spent_hours ||= spent_time.sum(:hours) || 0
       
       if spent_hours > 0 then
@@ -65,7 +62,7 @@ module IssuePatch
         spent_time.each do |entry|
           h[entry.activity.name] += entry.hours
           # update time entries billed status
-          entry.qbo_billed = true
+          entry.billed = true
           entry.save
         end
         
@@ -83,8 +80,7 @@ module IssuePatch
           
           # 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.employee_id = assigned_to.employee_id 
           time_entry.customer_id = customer_id
           time_entry.billable_status = "Billable"
           time_entry.hours = hours

lib/issues_form_hook_listener.rb

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

lib/issues_show_hook_listener.rb

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

lib/query_patch.rb

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

lib/time_entry_query_patch.rb

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

lib/user_patch.rb

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

lib/users_show_hook_listener.rb

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

test/unit/qbo_employee_test.rb

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