Merge branch 'dev' into hooks

Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'quickbooks-ruby'
 gem 'oauth2'
 gem 'roxml'
-gem 'nhtsa_vin'
 gem 'will_paginate'
 gem 'rails-jquery-autocomplete'
 gem 'jquery-ui-rails'

README.md

@@ -65,7 +65,6 @@ Note: After the inital synchronization, this plugin will recieve push notificati
 
 ## TODO
   * Add Setting for Sandbox Mode
-  * Seperate Vehicles into a seperate plugin (I use redmine for my automotive shop management 😉)
   * MORE Stuff as I make it up...
 
 ## License

app/controllers/customers_controller.rb

@@ -39,12 +39,6 @@ class CustomersController < ApplicationController
     params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
   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
@@ -88,7 +82,6 @@ class CustomersController < ApplicationController
   def show
     begin
       @customer = Customer.find_by_id(params[:id])
-      @vehicles = @customer.vehicles.paginate(:page => params[:page])
       @issues = @customer.issues.order(id: :desc)
       @billing_address = address_to_s(@customer.billing_address)
       @shipping_address = address_to_s(@customer.shipping_address)

app/controllers/invoice_controller.rb

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

app/controllers/vehicles_controller.rb

@@ -1,126 +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 VehiclesController < ApplicationController
-  unloadable
-
-  include AuthHelper
-
-  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)
-        redirect_to @vehicles.first
-      end
-    end
-  end
-
-  # return an HTML form for creating a new vehicle
-  def new
-    @vehicle = Vehicle.new
-    @customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
-  end
-
-  # create a new vehicle
-  def create
-    @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 Vehicle.find_by_vin @vehicle.vin
-    end
-  end
-
-  # display a specific vehicle
-  def show
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
-      @issues = @vehicle.issues.order(id: :desc)
-      @closed_issues = (@issues - @issues.open)
-    rescue 
-      render_404
-    end
-  end
-
-  # return an HTML form for editing a vehicle
-  def edit
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      @customer = @vehicle.customer
-    rescue 
-      render_404
-    end
-  end
-
-  # update a specific vehicle
-  def update
-    @customer = params[:customer]
-    begin
-      @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(allowed_params)
-        flash[:notice] = "Vehicle updated"
-        redirect_to @vehicle
-      else
-        redirect_to edit_vehicle_path
-      end
-      #show any errors anyways
-      flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
-    rescue 
-      render_404
-    end
-  end
-
-  # delete a specific vehicle
-  def destroy
-    begin
-      Vehicle.find_by_id(params[:id]).destroy
-      flash[:notice] = "Vehicle deleted successfully"
-      redirect_to action: :index
-    rescue 
-      render_404
-    end
-  end
-
-  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|
-      if val!=0
-        return false if found_non_zero
-        found_non_zero = true
-      end
-    end
-    found_non_zero
-  end
-
-end

app/models/customer.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -15,8 +15,7 @@ class Customer < ActiveRecord::Base
   has_many :purchases
   has_many :invoices
   has_many :estimates
-  has_many :vehicles
+ 
-  
   validates_presence_of :id, :name
   
   self.primary_key = :id
@@ -142,17 +141,14 @@ class Customer < ActiveRecord::Base
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync 
-    service = Qbo.get_base(:customer)
-
     # Sync ALL customers if the database is empty
-    #if count == 0
+    qbo = Qbo.first
-      customers = service.all
+    customers = qbo.perform_authenticated_request do |access_token|
-    #else
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-    #  last = Qbo.first.last_sync
+      service.all
-    #  query = "Select Id, DisplayName From Customer"
+    end
-    #  query << " Where Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
+    
-    #  customers = service.query(query)
+    return unless customers
-    #end
     
     customers.each do |c|
       logger.info "Processing customer #{c.id}"
@@ -180,9 +176,14 @@ class Customer < ActiveRecord::Base
   # proforms a bruteforce sync operation
   # This needs to be simplified
   def self.sync_by_id(id) 
-    service = Qbo.get_base(:customer)
+    qbo = Qbo.first
+    customer = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
+
+    return unless customer
 
-    customer = service.fetch_by_id(id)
     customer = Customer.find_or_create_by(id: customer.id)
     if customer.active?
       if not customer.name.eql? customer.display_name
@@ -200,7 +201,11 @@ class Customer < ActiveRecord::Base
   # Push the updates
   def save_with_push
     begin
-      @details = Qbo.get_base(:customer).update(@details)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        serivce.update(@details)
+      end
       #raise "QBO Fault" if @details.fault?
       self.id = @details.id
     rescue Exception => e
@@ -218,7 +223,11 @@ class Customer < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:customer).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Customer.new
     end

app/models/employee.rb

@@ -13,12 +13,14 @@ class Employee < ActiveRecord::Base
   has_many :users
   validates_presence_of :id, :name
   
-  def self.get_base
-    Qbo.get_base(:employee)
-  end
-  
   def self.sync 
-    employees = get_base.all
+    qbo = Qbo.first
+    employees = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all
+    end
+
+    return unless employees
     
     transaction do
       # Update the item table
@@ -33,7 +35,13 @@ class Employee < ActiveRecord::Base
   end
 
   def self.sync_by_id(id)
-    employee = get_base.fetch_by_id(id)
+    qbo = Qbo.first
+    employee = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.fetch_by_id(id)
+    end
+
+    return unless employee
     employee = find_or_create_by(id: employee.id)
     employee.name = employee.display_name
     employee.id = employee.id

app/models/estimate.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -16,15 +16,17 @@ class Estimate < ActiveRecord::Base
   validates_presence_of :doc_number, :id
   self.primary_key = :id
   
-  # return the QBO Estimate service
-  def self.get_base
-    Qbo.get_base(:estimate)
-  end
-  
   # sync all estimates
   def self.sync
     logger.debug "Syncing ALL estimates"
-    estimates = get_base.all
+    qbo = Qbo.first
+    estimates = qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service.all
+    end
+
+    return unless estimates
+
     estimates.each { |estimate|
       process_estimate(estimate)
     }
@@ -36,17 +38,28 @@ class Estimate < ActiveRecord::Base
   # sync only one estimate
   def self.sync_by_id(id)
     logger.debug "Syncing estimate #{id}"
-    process_estimate(get_base.fetch_by_id(id))
+    qbo = Qbo.first
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      process_estimate(service.fetch_by_id(id))
+    end
   end
   
   # update an estimate
   def self.update(id)
     # Update the item table
-    estimate = get_base.fetch_by_id(id)
+    qbo = Qbo.first
-    estimate = find_or_create_by(id: id)
+    estimate = qbo.perform_authenticated_request do |access_token|
-    estimate.doc_number = estimate.doc_number
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-    estimate.txn_date = estimate.txn_date
+      service.fetch_by_id(id)
-    estimate.save!
+    end
+
+    return unless estimate
+
+    e = find_or_create_by(id: id)
+    e.doc_number = estimate.doc_number
+    e.txn_date = estimate.txn_date
+    e.save!
   end
   
   # process an estimate into the database
@@ -62,9 +75,12 @@ class Estimate < ActiveRecord::Base
 
   # download the pdf from quickbooks
   def pdf
-    base = Estimate.get_base
+    qbo = Qbo.first
-    estimate = base.fetch_by_id(id)
+    qbo.perform_authenticated_request do |access_token|
-    return base.pdf(estimate)
+      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      estimate = service.fetch_by_id(id)
+      service.pdf(estimate)
+    end
   end
 
   # Magic Method
@@ -91,7 +107,11 @@ class Estimate < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:estimate).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service(:estimate).fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Estimate.new
     end

app/models/invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -15,11 +15,6 @@ class Invoice < ActiveRecord::Base
   validates_presence_of :doc_number, :id, :customer_id, :txn_date
   self.primary_key = :id
   
-  # Get the quickbooks-ruby base for invoice
-  def self.get_base
-    Qbo.get_base(:invoice)
-  end
-  
   # sync ALL the invoices
   def self.sync
     logger.debug "Syncing all invoices"
@@ -30,11 +25,13 @@ class Invoice < ActiveRecord::Base
   
     # TODO actually do something with the above query
     # .all() is never called since count is never initialized
-    if count == 0
+    qbo = Qbo.first
-      invoices = get_base.all 
+    invoices = qbo.perform_authenticated_request do |access_token|
-    else
+      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-      invoices = get_base.query()
+      service.all 
     end
+
+    return unless invoices
      
     invoices.each { | invoice | 
       process_invoice invoice
@@ -44,8 +41,12 @@ class Invoice < ActiveRecord::Base
   #sync by invoice ID
   def self.sync_by_id(id)
     logger.debug "Syncing invoice #{id}"
-    invoice = get_base.fetch_by_id(id) 
+    qbo = Qbo.first
-    process_invoice invoice
+    qbo.perform_authenticated_request do |access_token|
+      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+      invoice = service.fetch_by_id(id) 
+      process_invoice invoice
+    end
   end
   
   private
@@ -104,58 +105,47 @@ class Invoice < ActiveRecord::Base
   # this condions causes an infinite loop as the webhook is called when an invoice is updated
   # TODO maybe add a cf_sync_confict flag to invoices
   def self.compare_custom_fields(issue, invoice)
+
     logger.debug "Comparing custom fields"
     # 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
-    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"
-          # Only update if blank to prevent infite loops
-          # TODO check cf_sync_confict flag once implemented
-          if cf.string_value.to_s.blank?
-            logger.debug " VIN was blank, updating the invoice vin in quickbooks"
-            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
+    logger.debug "Calling :process_invoice_custom_fields hook"
-        end
+    context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
-      rescue
+
-        #do nothing
+    unless context.nil?
-      end
+      logger.debug "We have a context!"
+      context= context.first
+      issue = context[:issue]
+      invoice = context[:invoice]
+      is_changed = context[:is_changed]
+    end
       
-      # Custom Values
+    # Custom Values
-      begin
+    begin
-        value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
+      value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
-        
+      
-        # Check to see if the value is blank...
+      # Check to see if the value is blank...
-        if not value.value.to_s.blank?
+      if not value.value.to_s.blank?
-          # Check to see if the value is diffrent
+        # Check to see if the value is diffrent
-          if not cf.string_value.to_s.eql? value.value.to_s
+        if not cf.string_value.to_s.eql? value.value.to_s
-            # update the custom field on the invoice
+          # update the custom field on the invoice
-            cf.string_value = value.value.to_s
+          cf.string_value = value.value.to_s
-            is_changed = true
+          is_changed = true
-          end
         end
-      rescue
-        # Nothing to do here, there is no match
       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
+      qbo = Qbo.first
+      qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.update(invoice) if is_changed
+      end
     rescue
       # Do nothing, probaly custome field sync confict on the invoice. 
       # This is a problem with how it's billed
@@ -187,7 +177,11 @@ class Invoice < ActiveRecord::Base
   def pull
     begin
       raise Exception unless self.id
-      @details = Qbo.get_base(:invoice).fetch_by_id(self.id)
+      qbo = Qbo.first
+      @details = qbo.perform_authenticated_request do |access_token|
+        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service.fetch_by_id(self.id)
+      end
     rescue Exception => e
       @details = Quickbooks::Model::Invoice.new
     end

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,34 +12,6 @@ class Qbo < ActiveRecord::Base
   unloadable
     
   include QuickbooksOauth
-
-  # 
-  # Get a quickbooks base service object for type
-  # @params type of base
-  #
-  def self.get_base(type)
-    qbo = self.first
-
-    qbo.perform_authenticated_request do |access_token|   
-      # build the reqiested service
-      case type
-        when :time_activity
-          return Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
-        when :customer
-          return Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
-        when :invoice
-          return Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
-        when :estimate
-          return Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
-        when :employee
-          return Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
-        when :item
-          return Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
-      else
-        return nil
-      end
-    end
-  end
   
   # Updates last sync time stamp
   def self.update_time_stamp

app/models/vehicle.rb

@@ -1,100 +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 Vehicle < ActiveRecord::Base
-  
-  unloadable
-  
-  belongs_to :customer
-  has_many :issues, :foreign_key => 'vehicles_id'
-  
-  validates_presence_of :customer
-  validates :vin, uniqueness: true
-  before_save :decode_vin
-  
-  self.primary_key = :id
-  
-  # returns a human readable string
-  def to_s
-    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 NHTSA
-  def details
-    get_details if @details.nil?
-    return @details
-  end
-  
-  # 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 model numbers
-  def model=(val)
-    # The to_s is in case you get nil/non-string
-    write_attribute(:model, val.to_s.titleize)
-  end
-  
-  # Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
-  def vin=(val)
-    val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
-    write_attribute(:vin, val)
-  end
-  
-  # search for a vin
-  def self.search(search)
-    where("vin LIKE ?", "%#{search}%")
-  end
-	
-  # decodes a vin and updates self
-  def decode_vin
-    get_details
-    if @details
-      begin
-        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
-    end
-    self.name = to_s
-  end
-  
-  private
-  
-  # init method to pull JSON details from NHTSA
-  def get_details
-    if self.vin?
-      #validate the vin before calling a remote server
-      validation = NhtsaVin.validate(self.vin)
-      begin
-        #if the vin validation failed, raise an exception and exit
-        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
-  end
-  
-end

app/views/customers/filter_vehicles_by_customer.js.erb

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

app/views/customers/show.html.erb

@@ -24,11 +24,7 @@
       </div>
         
       <div class="splitcontentleft">
-        <h4><%=t(:field_vehicles)%>:</h4>
+        <% call_hook :show_customer_view_right %>
-        <%= render :partial => 'vehicles/list' %>
-        <div style="float: right;">
-          <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
-        </div>
       </div>
     </div>
 

app/views/issues/_form_hook.html.erb

@@ -9,6 +9,7 @@
     <%= select_estimate %>
 </p> 
 
-<p>
+
-    <%= vehicle %>
+<%# <p> %>
-</p>
+    <%# <%= call_hook here %> %>
+<%# </p> %>

app/views/issues/_show_details.html.erb

@@ -17,19 +17,6 @@
    </div>
       
   <div class="splitcontentleft">
-    <div class="vehicle attribute">
+    <%# call_hook here %>
-      <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/vehicles/_details.html.erb

@@ -1,45 +0,0 @@
-<div class="issue">
-  <div class="splitcontent">
-    <div class="splitcontentleft">
-      <h4><%=t(:label_details)%>:</h4>
-      
-      <table>
-        <tbody>
-
-          <tr>
-            <th><%= t(:field_customer)%></th>
-            <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
-          </tr>
-        
-          <tr>
-            <th><%= t(:field_vehicle) %></th>
-            <td><%= vehicle.to_s %></td>
-          </tr>
-          
-          <tr>
-            <th><%= t(:field_vin) %></th>
-            <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
-          </tr>
-          
-          <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/_form.html.erb

@@ -1,56 +0,0 @@
-<div class="row">
-  <div class="span6 columns">
-    <fieldset>
-
-      <%= form_for @vehicle do |f| %> 
-        <div class="clearfix">
-          <%=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">
-          <%=t(:label_year)%>: 
-          <div class="input">
-            <%= f.number_field :year, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_make)%>:
-          <div class="input">
-            <%= f.text_field :make, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_model)%>:
-          <div class="input">
-            <%= f.text_field :model, :autocomplete => "off"  %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:field_vin)%>:
-          <div class="input">
-            <%= f.text_field :vin , :autofocus => true %>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:field_notes)%>: 
-          <div class="input">
-            <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
-          </div>
-        </div>
-        
-       <div class="actions">
-        <%= f.submit %>
-       </div>
-      <% end %>
-
-    </fieldset>
-  </div>
-</div>

app/views/vehicles/_list.html.erb

@@ -1,28 +0,0 @@
-<% if @vehicles.present? %>
-
-  <% @vehicles.each do |vehicle| %>
-    <div class="row">
-      <div>
-        <b><%= link_to "##{vehicle.id}", vehicle_path(vehicle) %> </b>
-      </div>
-      
-      <div>
-        <%= vehicle.to_s %>
-        <br/>
-        <%= vehicle.customer %>
-        <br/>
-        <%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
-      </div>
-    </div>
-    <br/>
-  <% end %>
-
-  <div class="actions">
-    <%= will_paginate @vehicles %>
-  </div>
-
-<p><%=t(:label_matching)%> <%=@vehicles.count%> <%=t(:field_vehicles) %> </p>
-
-<% else %>
-  <p><%=t(:label_no_vehicles)%> <%= params[:search] %>.</p>
-<% end %>

app/views/vehicles/_search.html.erb

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

app/views/vehicles/_vehicle.html.erb

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

app/views/vehicles/edit.html.erb

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

app/views/vehicles/index.html.erb

@@ -1,4 +0,0 @@
-<h2><%=t(:label_cusomer_vehicles)%> <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2> 
-<br/> 
-
-<%= render :partial => 'vehicles/list' %>

app/views/vehicles/new.html.erb

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

app/views/vehicles/show.html.erb

@@ -1,11 +0,0 @@
-<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%></h2>
-
-<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
-
-<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)} %>

assets/javascripts/application.js

@@ -1,10 +1,5 @@
 $(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",
@@ -13,11 +8,4 @@ $(function() {
     });
   });
     
-  $("input#project_customer_id").on("change", function() {
-    $.ajax({
-      url: "/filter_vehicles_by_customer",
-      type: "GET",
-      data: { selected_customer: $("input#project_customer_id").val() }
-    });
-  });
 });

config/locales/en.yml

@@ -16,9 +16,6 @@ en:
   field_employee: "Employee"
   field_invoice: "Invoice"
   field_estimate: "Estimate" 
-  field_vehicles: "Vehicles"
-  field_vehicle: "Vehicle"
-  field_vin: "VIN"
   field_notes: "Notes"
   field_billed: "Billed"
   label_week: "Week"
@@ -31,13 +28,8 @@ en:
   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"

config/routes.rb

@@ -31,15 +31,9 @@ get 'customers/view/:token', :to => 'customers#view', as: :view
 get 'customers/share/:id', :to => 'customers#share', as: :share
 
 #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

db/migrate/016_create_vehicles.rb

@@ -1,24 +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 CreateVehicles < ActiveRecord::Migration[5.1]
-  
-  def change  
-    create_table :vehicles do |t| 
-      t.integer :year
-      t.string  :make
-      t.string  :model
-      t.string  :vin
-      t.text    :notes
-    end
-    
-    add_reference :vehicles, :qbo_customer, index: true
-  end
-end

db/migrate/017_update_issues_with_vehicles.rb

@@ -1,15 +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 UpdateIssuesWithVehicles < ActiveRecord::Migration[5.1]
-  def change
-    add_reference :issues, :vehicles, index: true
-  end
-end

db/migrate/018_update_vehicles.rb

@@ -1,15 +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 UpdateVehicles < ActiveRecord::Migration[5.1]
-  def change
-    add_column :vehicles, :name, :text
-  end
-end

db/migrate/019_qbocustomers_to_customers.rb

@@ -12,6 +12,5 @@ class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
   def change
     rename_table :qbo_customers, :customers
     rename_column :issues, :qbo_customer_id, :customer_id
-    rename_column :vehicles, :qbo_customer_id, :customer_id
   end 
 end

db/migrate/025_update_projects.rb

@@ -11,6 +11,5 @@
 class UpdateProjects < ActiveRecord::Migration[5.1]
   def change
     add_reference :projects, :customer, index: true
-    add_reference :projects, :vehicle, index: true
   end
 end

db/migrate/032_add_txn_dates.rb

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

db/migrate/033_update_vehicles_trim.rb

@@ -1,30 +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 UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
-  def change
-    add_column :vehicles, :doors, :text
-    add_column :vehicles, :trim, :text
-
-    reversible do |direction|
-      direction.up {
-
-        # Update local vehicle database by forcing a save, look at before_save
-        vehicles = Vehicle.all
-        vehicles.each { |vehicle|
-            vehicle.save!
-        }
-
-      }
-    end
-
-  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 '2.0.1'
+  version '2.0.2'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -33,12 +33,10 @@ Redmine::Plugin.register :redmine_qbo do
   Issue.safe_attributes 'item_id'
   Issue.safe_attributes 'estimate_id'
   Issue.safe_attributes 'invoice_id'
-  Issue.safe_attributes 'vehicles_id'
   User.safe_attributes 'employee_id'
   TimeEntry.safe_attributes 'billed'
   Project.safe_attributes 'customer_id'
-  Project.safe_attributes 'vehicle_id'
+  
-
   # We are playing in the sandbox 
   #Quickbooks.sandbox_mode = true
 
@@ -48,10 +46,8 @@ 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_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?}
-  menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
     
 end

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2022 rick barrette
+#Copyright (c) 2023 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -26,7 +26,6 @@ module IssuePatch
       belongs_to :customer_token, primary_key: :id
       belongs_to :estimate, primary_key: :id
       has_and_belongs_to_many :invoices
-      belongs_to :vehicle, primary_key: :id
     end
     
   end
@@ -52,46 +51,49 @@ module IssuePatch
       if spent_hours > 0 then
         
         # Prepare to create a new Time Activity
-        time_service = Qbo.get_base(:time_activity)
+        qbo = Qbo.first
-        item_service = Qbo.get_base(:item)
+        qbo.perform_authenticated_request do |access_token|
-        time_entry = Quickbooks::Model::TimeActivity.new
+          time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
+          item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
+          time_entry = Quickbooks::Model::TimeActivity.new
   
-        # Lets total up each activity before billing.
+          # Lets total up each activity before billing.
-        # This will simpify the invoicing with a single billable time entry per time activity
+          # This will simpify the invoicing with a single billable time entry per time activity
-        h = Hash.new(0)
+          h = Hash.new(0)
-        spent_time.each do |entry|
+          spent_time.each do |entry|
-          h[entry.activity.name] += entry.hours
+            h[entry.activity.name] += entry.hours
-          # update time entries billed status
+            # update time entries billed status
-          entry.billed = true
+            entry.billed = true
-          entry.save
+            entry.save
-        end
+          end
-        
-        # Now letes upload our totals for each activity as their own billable time entry
-        h.each do |key, val|
           
-          # Convert float spent time to hours and minutes
+          # Now letes upload our totals for each activity as their own billable time entry
-          hours = val.to_i
+          h.each do |key, val|
-          minutesDecimal = (( val - hours) * 60)
+            
-          minutes = minutesDecimal.to_i
+            # Convert float spent time to hours and minutes
+            hours = val.to_i
+            minutesDecimal = (( val - hours) * 60)
+            minutes = minutesDecimal.to_i
 
-          # Lets match the activity to an qbo item
+            # Lets match the activity to an qbo item
-          item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
+            item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
-          next if item.nil?
+            next if item.nil?
-          
+            
-          # Create the new billable time entry and upload it
+            # Create the new billable time entry and upload it
-          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
+            time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
-          time_entry.employee_id = assigned_to.employee_id 
+            time_entry.employee_id = assigned_to.employee_id 
-          time_entry.customer_id = customer_id
+            time_entry.customer_id = customer_id
-          time_entry.billable_status = "Billable"
+            time_entry.billable_status = "Billable"
-          time_entry.hours = hours
+            time_entry.hours = hours
-          time_entry.minutes = minutes
+            time_entry.minutes = minutes
-          time_entry.name_of = "Employee"
+            time_entry.name_of = "Employee"
-          time_entry.txn_date = Date.today
+            time_entry.txn_date = Date.today
-          time_entry.hourly_rate = item.unit_price
+            time_entry.hourly_rate = item.unit_price
-          time_entry.item_id = item.id 
+            time_entry.item_id = item.id 
-          time_entry.start_time = start_date
+            time_entry.start_time = start_date
-          time_entry.end_time = Time.now
+            time_entry.end_time = Time.now
-          time_service.create(time_entry)
+            time_service.create(time_entry)
+          end
         end
       end
     end

lib/issues_form_hook_listener.rb

@@ -26,13 +26,11 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     # 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 the issue already belongs to a customer
     selected_customer = context[:issue].customer ? context[:issue].customer.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
     customer = Customer.find_by_id(selected_customer) if selected_customer
@@ -52,22 +50,15 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
       :id => "issue_customer_id",
       :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
 
-    # Load estimates & vehicles
+    # Load estimates
     if context[:issue].customer
-      if customer.vehicles
-        vehicles = customer.vehicles.pluck(:name, :id)
-      else
-        vehicles = [nil].compact
-      end
       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 estimates & vehicles
+    # Generate the drop down list of quickbooks estimates
     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
 
     # Pass all prebuilt form components to our partial
     context[:controller].send(:render_to_string, {
@@ -77,7 +68,6 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
 	        customer_id: customer_id, 
 	        context: context, 
 	        select_estimate: select_estimate,
-	        vehicle: vehicle
         } 
       }
     )

lib/issues_show_hook_listener.rb

@@ -35,27 +35,13 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
 	      invoice_link = invoice_link.html_safe
       end
     end
-    
-    begin
-      v = Vehicle.find(issue.vehicles_id)
-      vehicle = link_to v.to_s, vehicle_path( v.id )
-      vin = v.vin 
-      notes = v.notes
-    rescue
-      #do nothing
-    end
-    
-    split_vin = vin.scan(/.{1,9}/) if vin
 
     context[:controller].send(:render_to_string, {
       :partial => 'issues/show_details',
         locals: {
           customer: customer, 
 	        estimate_link: estimate_link, 
-	        invoice_link: invoice_link, 
+	        invoice_link: invoice_link
-	        vehicle: vehicle, 
-	        split_vin: split_vin,
-	        notes: notes
         } 
       })
   end

lib/pdf_patch.rb

@@ -55,16 +55,10 @@ module PdfPatch
       left << [l(:field_priority), issue.priority]
       left << [l(:field_customer), customer]
       left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
-      #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id')
+   
-      #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
+      logger.debug "Calling :pdf_left hook"
-      
+      context = Redmine::Hook.call_hook :pdf_left, { array: left, issue: issue }
-      v = Vehicle.find_by_id(issue.vehicles_id)
+      left = left + context.first unless context.nil?
-      vehicle = v ? v.to_s : nil
-      vin = v ? v.vin : nil
-      notes = v ? v.notes : nil
-      left << [l(:field_vehicles), vehicle]
-      left << [l(:field_vin), vin ? vin.gsub(/(.{9})/, '\1 ') : nil]
-      #left << [l(:field_notes), notes]
       
       right = []
       right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
@@ -72,7 +66,10 @@ module PdfPatch
       right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
       right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
       right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
-      right << [l(:field_notes), notes]
+   
+      logger.debug "Calling :pdf_right hook"
+      context = Redmine::Hook.call_hook :pdf_right, { array: right, issue: issue }
+      right = right + context.first unless context.nil?
 
       rows = left.size > right.size ? left.size : right.size
       while left.size < rows

lib/project_patch.rb

@@ -23,7 +23,6 @@ module ProjectPatch
   base.class_eval do
     unloadable # Send unloadable so it will not be unloaded in development
     belongs_to :customer, primary_key: :id
-    belongs_to :vehicle, primary_key: :id
   end
   end
 end

lib/projects_form_hook_listener.rb

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