0.5.0

Permissions

Gemfile

@@ -6,7 +6,10 @@ gem 'oauth-plugin'
 gem 'oauth'
 gem 'roxml'
 gem 'edmunds_vin'
-gem 'will_paginate', '~> 3.1.0'
+gem 'will_paginate'
+gem 'rails-jquery-autocomplete'
+gem 'jquery-rails', '~> 3.1.4'
+gem 'jquery-ui-rails'
 
 group :assets do
   gem 'coffee-rails'

LICENSE

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

README.md

@@ -1,4 +1,4 @@
-#Redmine Quickbooks Online
+# Redmine Quickbooks Online
 
 A plugin for Redmine to connect to Quickbooks Online
 
@@ -8,7 +8,7 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
 
 `Note: I am currently using this in a live production enviroment with no issues`
 
-####Features
+#### 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.
@@ -27,14 +27,14 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
     + `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
+## Prerequisites
 
 * Sign up to become a developer for Intuit https://developer.intuit.com/
 * Create your own aplication to obtain your API keys
 * Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
   - See https://developer.intuit.com/docs/0100_accounting/0300_developer_guides/webhooks
 
-##The Install
+## The Install
 
 1. To install, clone this repo into your plugin folder
 
@@ -73,11 +73,11 @@ Note: After the inital synchronization, this plugin will recieve push notificati
   * Fix Issue sort by Customer
   * MORE Stuff...
 
-##License
+## License
 
 The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+Copyright (c) 2017 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app/controllers/customers_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -27,11 +27,26 @@ class CustomersController < ApplicationController
   include SortHelper
   helper :timelog
   
-  before_filter :require_user, :except => :view
+  before_filter :add_customer, :only => :new
+  before_filter :view_customer, :except => :new
   skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:view]
   
   default_search_scope :names
   
+  autocomplete :customer, :name, :full => false, :extra_data => [:id]
+  
+  def filter_vehicles_by_customer
+    @filtered_vehicles = Vehicle.all.where(customer_id: params[:selected_customer])
+  end
+  
+  def filter_invoices_by_customer
+    @filtered_invoices = QboInvoice.all.where(customer_id: params[:selected_customer])
+  end
+  
+  def filter_estimates_by_customer
+    @filtered_estimates = QboEstimate.all.where(customer_id: params[:selected_customer])
+  end
+  
   # display a list of all customers
   def index
     if params[:search]
@@ -105,9 +120,14 @@ class CustomersController < ApplicationController
   
   # Customer view for an issue
   def view
-    token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
+    
-    if token.first
+    User.current = User.find_by lastname: 'Anonymous'
-      @issue = Issue.find token.first.issue_id
+    
+    @token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
+    @token = @token.first
+    if @token
+      session[:token] = @token.token
+      @issue = Issue.find @token.issue_id
       @journals = @issue.journals.
                   preload(:details).
                   preload(:user => :email_address).
@@ -133,6 +153,14 @@ class CustomersController < ApplicationController
   
   private
   
+  def add_customer
+    global_check_permission(:add_customers)
+  end
+  
+  def view_customer
+    global_check_permission(:view_customers)
+  end
+  
   def only_one_non_zero?( array )
     found_non_zero = false
     array.each do |val|

app/controllers/estimate_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/controllers/invoice_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,7 +12,8 @@ class InvoiceController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user
+  before_filter :require_user, :unless => proc {|c| session[:token].nil? }
+  skip_before_filter :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
   
   #
   # Downloads and forwards the invoice pdf

app/controllers/payments_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,7 +12,7 @@ class PaymentsController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user
+  before_filter :check_permissions
   
   def new
     @payment = Payment.new
@@ -32,11 +32,17 @@ class PaymentsController < ApplicationController
     else
       flash[:error] = @payment.errors.full_messages.to_sentence 
       redirect_to new_customer_path
-end
+    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|

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -66,8 +66,12 @@ class QboController < ApplicationController
   # Manual Billing
   def bill
     i = Issue.find_by_id params[:id]
+    if i.customer
       i.bill_time
       redirect_to i, :flash => { :notice => "Successfully Billed #{i.customer.name}" }
+    else
+      redirect_to i, :flash => { :error => "Cannot bill without a customer assigned" }
+    end
   end
   
   # Quickbooks Webhook Callback
@@ -129,10 +133,10 @@ class QboController < ApplicationController
     Thread.new do
       if Qbo.exists?
         Customer.sync
+        QboInvoice.sync
         QboItem.sync
         QboEmployee.sync
         QboEstimate.sync
-        QboInvoice.sync
         
         # Record the last sync time
         Qbo.update_time_stamp

app/controllers/vehicles_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -57,6 +57,7 @@ class VehiclesController < ApplicationController
   def show
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
+      @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
     rescue ActiveRecord::RecordNotFound
       render_404
     end
@@ -101,15 +102,6 @@ class VehiclesController < ApplicationController
     end
   end
   
-  # returns a dynamic list of vehicles owned by a customer
-  def update_vehicles
-    @vehicles = Customer.find_by(customer_id: params[:customer_id].to_i).vehicles
-    respond_to do |format|
-      format.html { render(:text => "not implemented") }
-      format.js
-    end
-  end
-  
   private
   
   def only_one_non_zero?( array )

app/helpers/auth_helper.rb

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

app/models/customer.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -13,6 +13,8 @@ class Customer < ActiveRecord::Base
   
   has_many :issues
   has_many :qbo_purchases
+  has_many :qbo_invoices
+  has_many :qbo_estimates
   has_many :vehicles
   
   attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone

app/models/customer_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -15,7 +15,7 @@ class CustomerToken < ActiveRecord::Base
   validates_presence_of :expires_at, :issue_id
   before_create :generate_token
 
-  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE_QBO__' + SecureRandom.uuid
   
   def generate_token
     self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)

app/models/payment.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/models/qbo.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/models/qbo_employee.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/models/qbo_estimate.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,44 +10,49 @@
 
 class QboEstimate < ActiveRecord::Base
   unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
   
+  has_and_belongs_to_many :issues
+  belongs_to :customer 
+  attr_accessible :doc_number, :id
+  validates_presence_of :doc_number, :id
+  self.primary_key = :id
+  
+  # return the QBO Estimate service
   def self.get_base
-    Qbo.get_base(:estimate)
+    Qbo.get_base(:estimate).service
   end
   
+  # sync all estimates
   def self.sync 
-    estimates = get_base.service.all
+    estimates = get_base.all
-  
-    # Update the item table
-    transaction do
     estimates.each { |estimate|
-          qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
+      process_estimate(estimate)
-          qbo_estimate.doc_number = estimate.doc_number
-          qbo_estimate.id = estimate.id
-          qbo_estimate.save!
     }
-    end
 
     #remove deleted estimates
     where.not(estimates.map(&:id)).destroy_all
   end
   
+  # sync only one estimate
   def self.sync_by_id(id)
-    estimate = get_base.service.fetch_by_id(id)
+    process_estimate(get_base.fetch_by_id(id))
-    qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
+  end
+  
+  # update an estimate
+  def self.update(id)
+    # Update the item table
+    estimate = get_base.fetch_by_id(id)
+    qbo_estimate = find_or_create_by(id: id)
     qbo_estimate.doc_number = estimate.doc_number
-    qbo_estimate.id = estimate.id
     qbo_estimate.save!
   end
   
-  def self.update(id)
+  # process an estimate into the database
-    # Update the item table
+  def self.process_estimate(estimate)
-    estimate = get_base.service.fetch_by_id(id)
+    qbo_estimate = find_or_create_by(id: estimate.id)
-      qbo_estimate = QboEstimate.find_or_create_by(id: id)
     qbo_estimate.doc_number = estimate.doc_number
+    qbo_estimate.customer_id = estimate.customer_ref.value
+    qbo_estimate.id = estimate.id
     qbo_estimate.save!
   end
 end

app/models/qbo_invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,6 +12,7 @@ class QboInvoice < 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
@@ -46,41 +47,65 @@ class QboInvoice < ActiveRecord::Base
     process_invoice invoice
   end
   
-  # processes the invoice into the system
+  private
-  def self.process_invoice(invoice)
   
-    is_changed = false
+   # Attach the invoice to the issue
+  def self.attach_to_issue(issue, invoice)
+    return if issue.nil?
     
-    # Scan the line items for hashtags and attach to the applicable issues
+    # skip this issue if the issue customer is not the same as the invoice customer
-    invoice.line_items.each { |line|
+    return if issue.customer_id != invoice.customer_ref.value.to_i
-      if line.description
-        line.description.scan(/#(\w+)/).flatten.each { |issue|
-          i = Issue.find_by_id(issue.to_i)
     
     # 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.save!
     
-          # Attach the invoice to the issue
+    unless issue.qbo_invoices.include?(qbo_invoice)
-          unless i.qbo_invoices.include?(qbo_invoice)
+      issue.qbo_invoices << qbo_invoice
-            i.qbo_invoices << qbo_invoice
+      issue.save!
-            i.save!
     end
     
+    compare_custom_fields(issue, invoice)
+  end
+  
+  # processes the invoice into the system
+  def self.process_invoice(invoice)
+    # Check the private notes 
+    if not invoice.private_note.nil?
+      invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
+        attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+      }
+    end
+    
+    # Scan the line items for hashtags and attach to the applicable issues
+    invoice.line_items.each { |line|
+      if line.description
+        line.description.scan(/#(\w+)/).flatten.each { |issue|
+          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+        }
+      end
+    }
+  end
+  
+  def self.compare_custom_fields(issue, invoice)
+    is_changed = false
+    
     # update the invoive custom fields with infomation from the work ticket if available
     invoice.custom_fields.each { |cf|
     
+      # TODO Add some hooks here
+      
       # VIN from the attached vehicle
       begin
         if cf.name.eql? "VIN"
-                vin = Vehicle.find(i.vehicles_id).vin
+          vin = Vehicle.find(issue.vehicles_id).vin
           break if vin.nil?
           if not cf.string_value.to_s.eql? vin
             cf.string_value = vin.to_s
             is_changed = true
-                  break
           end
         end
       rescue
@@ -89,7 +114,7 @@ class QboInvoice < ActiveRecord::Base
       
       # Custom Values
       begin
-              value = i.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...
         if not value.value.to_s.blank?
@@ -102,32 +127,28 @@ class QboInvoice < ActiveRecord::Base
                 cf.string_value = value.value.to_s
                 is_changed = true
               end
-                    break
-                  end
-                    
             # Use the max milage
-                  if cf.name.eql? "Mileage Out"
+            elsif  cf.name.eql? "Mileage Out"
               if cf.string_value.to_i < value.value.to_i or cf.string_value.blank?
                 cf.string_value = value.value.to_s
                 is_changed = true
               end
-                    break
+            else
-                  end
-                  
               # Everything else
               cf.string_value = value.value.to_s
               is_changed = true
             end
           end
+        end
       rescue
         # Nothing to do here, there is no match
       end
     }
-        }
+    
-      end
+    # TODO Add some hooks here
-    }
 
     # Push updates
+    #invoice.sync_token += 1 if is_changed
     get_base.update(invoice) if is_changed
   end
     

app/models/qbo_item.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/models/qbo_purchase.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/models/vehicle.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

app/views/customers/_details.html.erb

@@ -1,10 +1,5 @@
 <table>
   <tbody>
-    <tr>
-      <th>Customer</th>
-      <td><%= customer.name %></td>
-    </tr>
-    
     <tr>
       <th>Email</th>
       <td><%= customer.email %></td>

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/filter_vehicles_by_customer.js.erb

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

app/views/customers/show.html.erb

@@ -1,12 +1,27 @@
-<h1>Customer #<%= @customer.id %></h1> 
+<div id="content">
-<br/> 
+  <h2>Customer #<%= @customer.id %></h2> 
-<h2>Details:</h2>
+  <br/> 
-<%= render :partial => 'customers/details', locals: {customer: @customer} %>
+  
-<br/>
+  <div class="subject">
-<h2>Vehicles:</h2>
+    <div><h3><%= @customer.name %></h3></div>
-<%= render :partial => 'vehicles/list' %>
+  </div>
-<%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
+  
-<br/>
+  <div class="attributes">
-<br/>
+  
-<h2>Issues:</h2>
+    <div class="splitcontent">
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues} %>
+      <div class="splitcontentleft">
+        <h4>Details:</h4>
+        <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+      </div>
+      <div class="splitcontentleft">
+        <h4>Vehicles:</h4>
+        <%= render :partial => 'vehicles/list' %>
+        <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
+      </div>
+    </div>
+    
+    <br/>
+    <h2>Issues:</h2>
+    <%= render :partial => 'issues/list_simple', locals: {issues: @issues} %>
+  </div>
+</div>

app/views/customers/view.html.erb

@@ -6,6 +6,7 @@
 
 <div class="subject">
 <%=  render_issue_subject_with_tree(@issue)  %>
+This customer link expires in <%= distance_of_time_in_words(Time.now, @token.expires_at) %>
 </div>
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
@@ -41,11 +42,11 @@
       rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
     end
   end
-  if User.current.allowed_to_view_all_time_entries?(@project)
+  #if User.current.allowed_to_view_all_time_entries?(@project)
     if @issue.total_spent_hours > 0
       rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
     end
-  end
+  #end
 end %>
 <%= render_custom_fields_rows(@issue) %>
 <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>

app/views/vehicles/_details.html.erb

@@ -13,7 +13,7 @@
     
     <tr>
       <th>VIN</th>
-      <td><%= vehicle.vin %></td>
+      <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
     </tr>
     
     <tr>

app/views/vehicles/_form.html.erb

@@ -41,14 +41,7 @@
         <div class="clearfix">
           Notes: 
           <div class="input">
-            <p>
+            <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
-              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@vehicle.new_record? ? nil : 'display:none') do %>
-                <%= f.text_area :notes,
-                    :cols => 60,
-                    :rows => 10,
-                    :no_label => true %>
-              <% end %>
-            </p>
           </div>
         </div>
         

app/workers/email_worker.rb

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

assets/javascripts/application.js

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

assets/javascripts/autocomplete-rails.js

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

assets/javascripts/update_vehicles.js.coffee

@@ -1,2 +0,0 @@
-$("#issue_vehicles_id").empty()
-  .append("<%= escape_javascript(render(:partial => @vehicles)) %>")

assets/javascripts/vehicles.js

@@ -1,10 +0,0 @@
-
-function customerSelected() {
-  customer_id = $('issue_customer_id').getValue();
-  console.log(customer_id);
-}
-
-document.observe('dom:loaded', function() {
-  customerSelected();
-  $('issue_customer_id').observe('change', customerSelected);
-});

config/routes.rb

@@ -34,12 +34,15 @@ resources :payments
 #webhook
 post 'qbo/webhook', :to => 'qbo#qbo_webhook'
 
-#ajax
+#java script routes
-get "update_vehicles" => 'vehicles#update_vehicles', as: 'update_vehicles'
+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

db/migrate/024_update_invoices_and_estimates.rb

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

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -23,15 +23,12 @@ Redmine::Plugin.register :redmine_qbo do
     require_dependency 'query_patch'
     require_dependency 'time_entry_query_patch'
     require_dependency 'pdf_patch'
-    
+    require_dependency 'attachments_controller_patch'
-    Rails.configuration.to_prepare do
-      Redmine::Search.available_search_types << 'customers'
-    end
 
     name 'Redmine Quickbooks Online plugin'
     author 'Rick Barrette'
     description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
-    version '0.4.1'
+    version '0.5.0'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -51,17 +48,20 @@ Redmine::Plugin.register :redmine_qbo do
     # set per_page globally
     WillPaginate.per_page = 10
   
+    permission :view_customers, :customers => :index, :public => false
+    permission :add_customers, :customers => :new, :public => false
+    permission :view_payments, :payments => :index, :public => false
+    permission :add_payments, :payments => :new, :public => false
+    permission :view_vehicles, :payments => :new, :public => false
+  
     # Register QBO top menu item
     #menu :top_menu, :qbo, { :controller => :qbo, :action => :index }, :caption => 'Quickbooks', :if => Proc.new { User.current.admin? }
-    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new { User.current.logged? }
+    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
-    menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
+    menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.allowed_to?(:view_vehicles, @project) }
     
-    menu :application_menu, :new_customer, { :controller => :customers, :action => :new }, :caption => 'New Customer', :if => Proc.new { User.current.logged? }
+    menu :application_menu, :new_customer, { :controller => :customers, :action => :new }, :caption => 'New Customer', :if => Proc.new { User.current.allowed_to?(:add_customers, @project) }
-    menu :application_menu, :new_payment, { :controller => :payments, :action => :new }, :caption => 'New Payment', :if => Proc.new { User.current.logged? }
+    menu :application_menu, :new_payment, { :controller => :payments, :action => :new }, :caption => 'New Payment', :if => Proc.new { User.current.allowed_to?(:add_payments, @project)}
     
-    permission :customers, { :customers => [:index, :new] }, :public => false
     menu :project_menu, :customers, { :controller => 'customers', :action => 'new' }, :caption => 'New Customer', :after => :new_issue, :param => :project_id
-    
-    permission :payments, { :payments => [:index, :new] }, :public => false
     menu :project_menu, :payments, { :controller => 'payments', :action => 'new' }, :caption => 'New Payment', :after => :customers, :param => :project_id
 end

lib/attachments_controller_patch.rb

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

lib/header_footer_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -72,7 +72,7 @@ module IssuePatch
           item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
           next if item.nil?
           
-          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial)" if not closed?}"
+          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
           # TODO entry.user.qbo_employee.id
           time_entry.employee_id = assigned_to.qbo_employee_id 
           time_entry.customer_id = customer_id
@@ -93,7 +93,7 @@ module IssuePatch
   
   # Create a shareable link for a customer
   def share_token
-    CustomerToken.create(:expires_at => Time.now + 24.hours, :issue_id => id)
+    CustomerToken.create(:expires_at => Time.now + 1.month, :issue_id => id)
   end
   
 end    

lib/issues_form_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,8 +12,8 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
   
   # Load the javascript
   def view_layouts_base_html_head(context = {})
-    js = javascript_include_tag 'vehicles', :plugin => 'redmine_qbo' 
+    js = javascript_include_tag 'application', :plugin => 'redmine_qbo'
-    #js += javascript_include_tag 'update_vehicles', :plugin => 'redmine_qbo'
+    js += javascript_include_tag 'autocomplete-rails', :plugin => 'redmine_qbo'
     return js
   end
   
@@ -27,25 +27,24 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     selected_estimate =  context[:issue].qbo_estimate ? context[:issue].qbo_estimate.id  : nil
     selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
     
-    # Load customer information without callbacks
+    # Load customer information
     customer = Customer.find_by_id(selected_customer) if selected_customer   
-    select_customer = f.select :customer_id, 
+    search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#issue_customer_id', :value => '#issue_customer'}
-                        Customer.all.pluck(:name, :id).sort, 
+    customer_id = f.hidden_field :customer_id, :id => "issue_customer_id"
-                        :selected => selected_customer, 
-                        include_blank: true, 
-                        onchange: "$customerSelected;"
-    
-    # Generate the drop down list of quickbooks extimates
-    select_estimate = f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true
     
     if context[:issue].customer
       vehicles = customer.vehicles.pluck(:name, :id).sort!
+      estimates = customer.qbo_estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
     else
-      vehicles = Vehicle.all.order(:name).pluck(:name, :id)
+      vehicles = [nil].compact
+      estimates = [nil].compact
     end
     
+     # Generate the drop down list of quickbooks extimates
+    select_estimate = f.select :qbo_estimate_id, estimates, :selected => selected_estimate, include_blank: true
+    
     vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
     
-    return "<p>#{select_customer}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
+    return "<p><label for=\"issue_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
   end
 end

lib/issues_save_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

lib/issues_show_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

lib/pdf_patch.rb

@@ -51,7 +51,7 @@ module IssuesPdfHelperPatch
       vin = v ? v.vin : nil
       notes = v ? v.notes : nil
       left << [l(:field_vehicles), vehicle]
-      left << [l(:field_vin), vin.gsub(/(.{9})/, '\1 ')]
+      left << [l(:field_vin), vin ? vin.gsub(/(.{9})/, '\1 ') : nil]
       #left << [l(:field_notes), notes]
       
       right = []

lib/query_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -36,7 +36,7 @@ module QueryPatch
       unless @available_columns
         @available_columns = available_columns_without_qbo
         @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
-        @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
+        @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
       end
       @available_columns
     end

lib/time_entry_query_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

lib/user_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #

lib/users_show_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #