fixed typos

view_customers, add_customers, view_payments, add_payments

Gemfile

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

README.md

@@ -6,23 +6,22 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
 
 `Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable`
 
+`Note: I am currently using this in a live production enviroment with no issues`
+
 ####Features
 * Issues can be assigned to a `Customer` via drop down in the edit Issue form
 * The `Employee` for the Issue is assigned via the assigned Redmine User
   - This is set via a drop down in the user admistration page.
 * IF an `Issue` has been assined a `Customer` when an Issue is closed the following will happen:
-  - A new `Time Activity` will be created for the `Customer` assinged to the issue for each Redmine Time Entery.
+  - A new `Time Activity` will be billed agaist the `Customer` assinged to the issue for each Redmine Time Entery. 
     + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
     + The Time Activity names are used to lookup `Items` in Quickbooks.
     + IF there isn'tany Items that match the Activity name it will be skipped, and will not be billed to the `Customer` 
   - Labor Rates are set by the `Item` in Quickbooks
-* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `Item` rates.
-  - Needs to have a `Customer` Assiged
 * `Payments` Can be created via the Redmine application menu
 * `Customers` Can be created via the Redmine application menu
-* `Customers` can be searched
+  - `Customers` can be searched
-* Basic information for the `Customer` can be viewed via the customer page
+  - Basic information for the `Customer` can be viewed/edit via the Customer page
-* `Custmoer` information can be update
 * Webhook Support
   - `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
     + `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
@@ -47,30 +46,27 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
   
 3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
 
-  ![Alt plugin_config](/Screenshots/plugin_config.png)
-
 4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
 
 5. Assign an Employee to each of your users via the User Administration Page
 
-  ![Alt plugin_user_edit](/Screenshots/plugin_user_edit.png)
+## Automatic Deploy
+  
+  If you want the redmine server to be automaticly restarted after a git pull event add this hook to your git hook directory
+  https://gist.github.com/rickbarrette/3c999c7f37e321f9c60380de99e494f5
 
 ## Usage
 
   To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
 
-  ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
-
 Note: After the inital synchronization, this plugin will recieve push notifications via Intuit's webhook service.
 
 ## TODO
   * Abiltiy to add line items to a ticket in a dynamic table so they can be added to the invoice upon closing of the issue
   * Customer Deletion
   * Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue. 
-  * Add a rake file to create required Trackers or statuses required
   * Add Setting for Sandbox Mode
   * Refactor Models prefixed with Qbo...
-  * Allow multiple Invoices to be attached to an Issue
   * Seperate Vehicles into a seperate plugin
   * Make HTML Pretty 
   * Intergrate Customer Search into Redmine Search

app/controllers/customers_controller.rb

@@ -13,11 +13,32 @@ class CustomersController < ApplicationController
   unloadable
   
   include AuthHelper
+  helper :issues
+  helper :journals
+  helper :projects
+  helper :custom_fields
+  helper :issue_relations
+  helper :watchers
+  helper :attachments
+  helper :queries
+  include QueriesHelper
+  helper :repositories
+  helper :sort
+  include SortHelper
+  helper :timelog
   
-  before_filter :require_user
+  before_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
+  
   # display a list of all customers
   def index
     if params[:search]
@@ -89,8 +110,49 @@ class CustomersController < ApplicationController
     end
   end
   
+  # Customer view for an issue
+  def view
+    
+    User.current = User.find_by lastname: 'Anonymous'
+    
+    @token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
+    @token = @token.first
+    if @token
+      session[:token] = @token.token
+      @issue = Issue.find @token.issue_id
+      @journals = @issue.journals.
+                  preload(:details).
+                  preload(:user => :email_address).
+                  reorder(:created_on, :id).to_a
+      @journals.each_with_index {|j,i| j.indice = i+1}
+      @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+      Journal.preload_journals_details_custom_fields(@journals)
+      @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
+      @journals.reverse! if User.current.wants_comments_in_reverse_order?
+  
+      @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
+      @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+  
+      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+      @priorities = IssuePriority.active
+      @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+      @relation = IssueRelation.new
+    else
+      render_403
+    end
+  end
+  
   private
   
+  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/invoice_controller.rb

@@ -12,13 +12,14 @@ 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
   #
   def show
-    base = QboInvoice.get_base.service
+    base = QboInvoice.get_base
     invoice = base.fetch_by_id(params[:id])
     @pdf = base.pdf(invoice)
     send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"

app/controllers/payments_controller.rb

@@ -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

@@ -16,7 +16,7 @@ class QboController < ApplicationController
   include AuthHelper
   
   before_filter :require_user, :except => :qbo_webhook
-  skip_before_filter :verify_authenticity_token, :check_if_login_required
+  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
 
   #
   # Called when the QBO Top Menu us shown
@@ -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

app/controllers/vehicles_controller.rb

@@ -103,7 +103,7 @@ class VehiclesController < ApplicationController
   
   # returns a dynamic list of vehicles owned by a customer
   def update_vehicles
-    @vehicles = Customer.find_by_id(params[:customer_id].to_i).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

app/helpers/auth_helper.rb

@@ -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_token.rb

@@ -0,0 +1,23 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class CustomerToken < ActiveRecord::Base
+  unloadable
+  has_many :issues
+  attr_accessible :token, :expires_at, :issue_id
+  validates_presence_of :expires_at, :issue_id
+  before_create :generate_token
+
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] || 'CONFIGURE_QBO__' + SecureRandom.uuid
+  
+  def generate_token
+    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
+  end
+end

app/models/qbo_invoice.rb

@@ -12,14 +12,15 @@ class QboInvoice < ActiveRecord::Base
   unloadable
   
   has_and_belongs_to_many :issues
-  attr_accessible :doc_number
+  attr_accessible :doc_number, :id
-  validates_presence_of :doc_number
+  validates_presence_of :doc_number, :id
   self.primary_key = :id
   
   def self.get_base
-    Qbo.get_base(:invoice)
+    Qbo.get_base(:invoice).service
   end
   
+  # sync ALL the invoices
   def self.sync
     last = Qbo.first.last_sync
     
@@ -27,48 +28,83 @@ class QboInvoice < ActiveRecord::Base
     query << " WHERE  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
   
     if count == 0
-      invoices = get_base.service.all 
+      invoices = get_base.all 
     else
-      invoices = get_base.service.query()
+      invoices = get_base.query()
     end
     
     # Update the invoice table 
     invoices.each { | invoice | 
-      sync_by_id invoice.id
+      process_invoice invoice
     }
   end
   
+  #sync by invoice ID
   def self.sync_by_id(id)
     #update the information in the database
-    invoice = Qbo.get_base(:invoice).service.fetch_by_id(id) 
+    invoice = get_base.fetch_by_id(id) 
-    qbo_invoice = find_or_create_by(id: invoice.id) 
+    process_invoice invoice
+  end
+  
+  private
+  
+   # Attach the invoice to the issue
+  def self.attach_to_issue(issue, invoice)
+    return if issue.nil?
+    
+    # skip this issue if the issue customer is not the same as the invoice customer
+    return if issue.customer_id != invoice.customer_ref.value.to_i
+    
+    # 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.save!
     
-    is_changed = false
+    unless issue.qbo_invoices.include?(qbo_invoice)
+      issue.qbo_invoices << qbo_invoice
+      issue.save!
+    end
+    
+    compare_custom_fields(issue, invoice)
+  end
+  
+  # processes the invoice into the 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|
-          i = Issue.find_by_id(issue.to_i)
+          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
-          begin
+        }
-            i.qbo_invoices << QboInvoice.find_by_id(invoice.id.to_i)
-            i.save!
-          rescue
-            # do nothing, the reccord exists
       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|
-            # VIN
+    
+      # 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.blank?
+          break if vin.nil?
-                cf.string_value = vin if not cf.string_value.to_s.eql? vin
+          if not cf.string_value.to_s.eql? vin
-                break
+            cf.string_value = vin.to_s
+            is_changed = true
+          end
         end
       rescue
         #do nothing
@@ -76,9 +112,30 @@ 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?
+          # Check to see if the value is diffrent
           if not cf.string_value.to_s.eql? value.value.to_s
+            
+            # Use the lowest Milage
+            if cf.name.eql? "Mileage In"
+              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
+            end
+              
+            # Use the max milage
+            if 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
+            end
+            
+            # Everything else
             cf.string_value = value.value.to_s
             is_changed = true
           end
@@ -87,17 +144,11 @@ class QboInvoice < ActiveRecord::Base
         # Nothing to do here, there is no match
       end
     }
+    
+    # TODO Add some hooks here
+
     # Push updates
-          Qbo.get_base(:invoice).service.update(invoice) if is_changed
+    get_base.update(invoice) if is_changed
-        }
-      end
-    }
   end
     
-  def self.update(id)
-    invoice = get_base.service.fetch_by_id(id)
-    qbo_invoice = find_or_create_by(id: id)
-    qbo_invoice.doc_number = invoice.doc_number
-    qbo_invoice.save!
-  end
 end

app/models/vehicle.rb

@@ -87,8 +87,8 @@ class Vehicle < ActiveRecord::Base
     if self.vin?
       begin
         @details = JSON.parse get_decoder.full(self.vin)
-        raise @details['message'] if @details['status'] == "NOT_FOUND" 
+        raise @details['message'] if @details['status'].to_s.eql? "NOT_FOUND" 
-        raise @details['message'] if @details['status'] == "BAD_REQUEST"
+        raise @details['message'] if @details['status'].to_s.eql? "BAD_REQUEST"
       rescue Exception => e
         errors.add(:vin, e.message)
       end

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_vehicles_by_customer.js.erb

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

app/views/customers/index.html.erb

@@ -24,5 +24,5 @@
 <% end %>
 
 <div>
-  <%= Customer.count %> Customers - <b>Last Sync: </b> <%= Qbo.last_sync %>
+  <%= Customer.count %> Customers - <b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
 </div>

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

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

app/views/qbo/_settings.html.erb

@@ -103,5 +103,5 @@ Note: You need to authenticate after saving your key and secret above
     <br/>
     
     <div>
-        <b>Last Sync: </b> <%= Qbo.last_sync %> <%= link_to " Sync Now", qbo_sync_path %>
+        <b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
 </div>

app/views/qbo/index.html.erb

@@ -36,7 +36,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     <br/>
     
     <div>
-        <b>Last Sync: </b> <%= Qbo.last_sync %>
+        <b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
     </div>
     
 </body>

app/views/vehicles/_form.html.erb

@@ -34,7 +34,7 @@
         <div class="clearfix">
           VIN:
           <div class="input">
-            <%= f.text_field :vin %>
+            <%= f.text_field :vin , :autofocus => true %>
           </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,9 @@
+$(function() {
+  $("input#issue_customer_id").on("change", function() {
+    $.ajax({
+      url:  "/filter_vehicles_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/autocomplete.js

@@ -1,4 +0,0 @@
-//= require jquery
-//= require jquery_ujs
-//= require jquery-ui
-//= require autocomplete-rails

config/locales/en.yml

@@ -19,3 +19,5 @@ en:
   field_vehicles: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
+  field_qbo_billed: "Billed"
+  label_week: "Week"

config/routes.rb

@@ -25,6 +25,9 @@ get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
 #manual billing
 get 'qbo/bill/:id', :to => 'qbo#bill', as: :bill
 
+#customer issue view
+get 'customers/view/:token', :to => 'customers#view', as: :view
+
 #payments
 resources :payments
 
@@ -32,11 +35,13 @@ resources :payments
 post 'qbo/webhook', :to => 'qbo#qbo_webhook'
 
 #ajax
-get "update_vehicles" => 'vehicles#update_vehicles', as: 'update_vehicles'
+get 'filter_vehicles_by_customer' => 'customers#filter_vehicles_by_customer'
 
 # Nest Vehicles under customers
 resources :customers do
   resources :vehicles
+  get :autocomplete_customer_name, :on => :collection
+  get :autocomplete_customer_vehicles, :on => :collection
 end
 
 #allow for just vehicles too

db/migrate/022_update_issues_remove_invoice.rb

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

db/migrate/023_create_customer_tokens.rb

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

init.rb

@@ -15,22 +15,20 @@ Redmine::Plugin.register :redmine_qbo do
    require_dependency 'issues_save_hook_listener'
    require_dependency 'issues_show_hook_listener'
    require_dependency 'users_show_hook_listener'
-   require_dependency 'header_footer_hook_listener.rb'
+   require_dependency 'header_footer_hook_listener'
    
    # Patches to the Redmine core.  Will not work in development mode
     require_dependency 'issue_patch'
     require_dependency 'user_patch'
     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.0'
+    version '0.4.2'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -50,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) 2016 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+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

@@ -14,6 +14,6 @@ class HeaderFooterHookListener < Redmine::Hook::ViewListener
   end
 
   def view_layouts_base_body_bottom(context = {})
-    return "<div class='footer' align='center'><b>Last Sync: </b> #{Qbo.last_sync}</div>"
+    return "<div id='qbo_footer' align='center'><b>Last Sync: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
   end
 end

lib/issue_patch.rb

@@ -23,6 +23,7 @@ module IssuePatch
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
       belongs_to :customer, primary_key: :id
+      belongs_to :customer_token, primary_key: :id
       belongs_to :qbo_estimate, primary_key: :id
       has_and_belongs_to_many :qbo_invoices
         #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
@@ -71,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
@@ -90,6 +91,11 @@ module IssuePatch
     end
   end
   
+  # Create a shareable link for a customer
+  def share_token
+    CustomerToken.create(:expires_at => Time.now + 1.month, :issue_id => id)
+  end
+  
 end    
 
 # Add module to Issue

lib/issues_form_hook_listener.rb

@@ -12,8 +12,9 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
   
   # Load the javascript
   def view_layouts_base_html_head(context = {})
-    javascript_include_tag 'vehicles', :plugin => 'redmine_qbo'
+    js = javascript_include_tag 'application', :plugin => 'redmine_qbo'
-    javascript_include_tag 'autocomplete', :plugin => 'redmine_qbo'
+    js += javascript_include_tag 'autocomplete-rails', :plugin => 'redmine_qbo'
+    return js
   end
   
   # Edit Issue Form
@@ -26,9 +27,10 @@ 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, Customer.all.pluck(:name, :id).sort, :selected => selected_customer, include_blank: true
+    search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#issue_customer_id', :value => '#issue_customer'}
+    customer_id = f.hidden_field :customer_id, :id => "issue_customer_id"
     
     # 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
@@ -36,11 +38,11 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     if context[:issue].customer
       vehicles = customer.vehicles.pluck(:name, :id).sort!
     else
-      vehicles = Vehicle.all.order(:name).pluck(:name, :id)
+      vehicles = [nil].compact
     end
     
     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_show_hook_listener.rb

@@ -52,8 +52,9 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     split_vin = vin.scan(/.{1,9}/) if vin
     
     return "
-    <div class=\"attributes\">
+    <div class=\"splitcontent\">
     
+      <div class=\"splitcontentleft\">
         <div class=\"customer_id attribute\">
           <div class=\"label\"><span>Customer</span>:</div>
           <div class=\"value\">#{customer}</div>
@@ -68,9 +69,9 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
           <div class=\"label\"><span>Invoice</span>:</div>
           <div class=\"value\">#{invoice_link}</div>
         </div>
+      </div>
       
-      <br/>
+      <div class=\"splitcontentleft\">
-
         <div class=\"vehicle attribute\">
           <div class=\"label\"><span>Vehicle</span>:</div>
           <div class=\"value\">#{vehicle}</div>
@@ -85,11 +86,14 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
           <div class=\"label\"><span>Notes</span>:</div>
           <div class=\"value\">#{notes}</div>
         </div>
-    </div>    "
+      </div>
+    </div>"
   end
   
   def view_issues_show_description_bottom(context={})
-    return "<br/> #{button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get}"
+    bill_button = button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get if User.current.admin?
+    share_button = button_to "Share", "#{Redmine::Utils::relative_url_root}/customers/view/#{context[:issue].share_token.token}", method: :get if User.current.logged?
+    return "<br/> #{bill_button} #{share_button}"
   end
   
 end

lib/pdf_patch.rb

@@ -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

@@ -36,6 +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}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
       end
       @available_columns
     end

lib/time_entry_query_patch.rb

@@ -0,0 +1,71 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_dependency 'time_entry_query'
+
+module TimeEntryQueryPatch
+
+  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
+      
+      alias_method_chain :available_columns, :qbo_billed
+      alias_method_chain :available_filters, :qbo_billed
+    end
+  end
+      
+  module ClassMethods
+    
+  end
+  
+  module InstanceMethods
+  
+    def available_columns_with_qbo_billed
+      unless @available_columns
+        @available_columns = available_columns_without_qbo
+        @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
+      end
+      @available_columns
+    end
+    
+    def available_filters_with_qbo_billed
+      unless @available_filters
+        @available_filters = available_filters_without_qbo 
+        
+        #qbo_filters = {
+        #  :customer => { 
+        #    :id => l(:field_qbo_billed),
+        #    :type => :boolean, 
+        #    :order => @available_filters.size + 1},
+        #}
+        
+        qbo_filters = { 
+          "qbo_billed" => {
+            :id => :qbo_billed,
+            :type => :list_optional, 
+            :order => @available_filters.size + 1,
+            #:values => Customer.find(:all).collect { |c| [c.name, c.id.to_s]}
+          }
+        }
+        
+        @available_filters.merge!(qbo_filters)
+      end
+      @available_filters
+    end
+  end
+end
+
+# Add module to TimeEntryQuery
+TimeEntryQuery.send(:include, QueryPatch)

test/unit/customer_token_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class CustomerTokenTest < ActiveSupport::TestCase
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end