Version Bump 0.4.1

* Various Bug Fixes
* Added a share button that creates a public view-able link for an issue that lasts 24 Hours

Gemfile

@@ -7,3 +7,7 @@ gem 'oauth'
 gem 'roxml'
 gem 'edmunds_vin'
 gem 'will_paginate', '~> 3.1.0'
+
+group :assets do
+  gem 'coffee-rails'
+end

README.md

@@ -1,20 +1,31 @@
 #Redmine Quickbooks Online
 
-A simple plugin for Redmine to connect to Quickbooks Online
+A plugin for Redmine to connect to Quickbooks Online
 
-The goal of this project is to allow redmine to connect with Quickbooks Online to create time activity entries for completed work when an issue is closed.
+The goal of this project is to allow Redmine to connect with Quickbooks Online to create `Time Activity Entries` for completed work when an Issue is closed.
 
-`Note: This project is under heavy development. Currently the initial functionality goal has been meet, however I am still working on adding other features. Tags should be stable`
+`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`
 
-####How it works
-* Issues can be assigned to a QBO Customer and QBO Service Item via drop down in issues form
-  - The `QBO Employee` for the issue is assigned via the assigned redmine user
-  - IF an `Issue` has been assined a `QBO Customer`, `QBO Service Item` & `QBO Employee` when an `Issue` is closed the following will happen:
-  - A new `QBO Time Activity` agaist the `QBO Customer` will be created using the total spent hours logged agaist an `Issue`.
-  - The rate will be the set via the `QBO Service Item` price
-* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `QBO Service Item` cost.
-  - Needs to have a `QBO Customer` & `QBO Service Item` Assiged
-* Users will be assigned a `QBO Employee` via a drop down in the user admistration page.
+`Note: 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 billed agaist the `Customer` assinged to the issue for each Redmine Time Entery. 
+    + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
+    + The Time Activity names are used to lookup `Items` in Quickbooks.
+    + IF there isn'tany Items that match the Activity name it will be skipped, and will not be billed to the `Customer` 
+  - Labor Rates are set by the `Item` in Quickbooks
+* `Payments` Can be created via the Redmine application menu
+* `Customers` Can be created via the Redmine application menu
+  - `Customers` can be searched
+  - Basic information for the `Customer` can be viewed/edit via the Customer page
+* Webhook Support
+  - `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
+    + `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
+  - `Customers` are automaticly updated in local database
 
 ##Prerequisites
 
@@ -35,28 +46,32 @@ 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 `QBO Time Activity` entries for an `Issue` , you need only to assign a `QBO Customer` and `QBO Item` to an `Issue` via drop downs in the creation/update form.
-  
-  ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
+  To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
 
 Note: After the inital synchronization, this plugin will recieve push notifications via Intuit's webhook service.
 
 ## TODO
   * Abiltiy to add line items to a ticket in a dynamic table so they can be added to the invoice upon closing of the issue
-  * Customer ~~Creation~~, ~~Update~~, Deletion
+  * Customer Deletion
   * Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue. 
-  * Add a rake file to create required Trackers or statuses required
   * Add Setting for Sandbox Mode
+  * Refactor Models prefixed with Qbo...
+  * Seperate Vehicles into a seperate plugin
+  * Make HTML Pretty 
+  * Intergrate Customer Search into Redmine Search
+  * Fix Issue sort by Customer
+  * MORE Stuff...
 
 ##License
 

app/controllers/customers_controller.rb

@@ -13,8 +13,22 @@ 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 :require_user, :except => :view
+  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:view]
   
   default_search_scope :names
   
@@ -89,6 +103,34 @@ class CustomersController < ApplicationController
     end
   end
   
+  # Customer view for an issue
+  def view
+    token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
+    if token.first
+      @issue = Issue.find token.first.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 only_one_non_zero?( array )

app/controllers/invoice_controller.rb

@@ -18,7 +18,7 @@ class InvoiceController < ApplicationController
   # 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

@@ -17,9 +17,9 @@ class PaymentsController < ApplicationController
   def new
     @payment = Payment.new
     
-    @customers = Customer.all
+    @customers = Customer.all.sort_by &:name
     
-    @accounts = Qbo.get_base(:account).service.query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' ")
+    @accounts = Qbo.get_base(:account).service.query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' Order By Name")
     
     @payment_methods = Qbo.get_base(:payment_method).service.all
   end

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
@@ -57,12 +57,19 @@ class QboController < ApplicationController
     qbo.reconnect_token_at = 5.months.from_now.utc
     qbo.company_id = params['realmId']
     if qbo.save!
-      redirect_to qbo_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+      redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
     else
       redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
     end
   end
   
+  # Manual Billing
+  def bill
+    i = Issue.find_by_id params[:id]
+    i.bill_time
+    redirect_to i, :flash => { :notice => "Successfully Billed #{i.customer.name}" }
+  end
+  
   # Quickbooks Webhook Callback
   def qbo_webhook
     
@@ -118,15 +125,19 @@ class QboController < ApplicationController
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
-    if Qbo.exists?
-      Customer.sync
-      QboItem.sync
-      QboEmployee.sync
-      QboEstimate.sync
-      QboInvoice.sync
-      
-      # Record the last sync time
-      Qbo.update_time_stamp
+    # Update info in background
+    Thread.new do
+      if Qbo.exists?
+        Customer.sync
+        QboItem.sync
+        QboEmployee.sync
+        QboEstimate.sync
+        QboInvoice.sync
+        
+        # Record the last sync time
+        Qbo.update_time_stamp
+      end
+      ActiveRecord::Base.connection.close
     end
 
     redirect_to qbo_path(:redmine_qbo), :flash => { :notice => "Successfully synced to Quickbooks" }

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/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']
+  
+  def generate_token
+    self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
+  end
+end

app/models/qbo_invoice.rb

@@ -10,66 +10,125 @@
 
 class QboInvoice < ActiveRecord::Base
   unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
+  
+  has_and_belongs_to_many :issues
+  attr_accessible :doc_number, :id
+  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
-    #Pull the invoices from the quickbooks server
-    #invoices = get_base.service.all
-    
     last = Qbo.first.last_sync
     
     query = "SELECT Id, DocNumber FROM Invoice"
     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 | 
-      qbo_invoice = find_or_create_by(id: invoice.id) 
-      qbo_invoice.doc_number = invoice.doc_number 
-      qbo_invoice.id = invoice.id
-      qbo_invoice.save! 
+      process_invoice invoice
     }
-    
-    #remove deleted invoices 
-    #where.not(invoices.map(&:id)).destroy_all
   end
   
+  #sync by invoice ID
   def self.sync_by_id(id)
     #update the information in the database
-    invoice = get_base.service.fetch_by_id(id) 
-    qbo_invoice = find_or_create_by(id: invoice.id) 
-    qbo_invoice.doc_number = invoice.doc_number 
-    qbo_invoice.id = invoice.id
-    qbo_invoice.save! 
+    invoice = get_base.fetch_by_id(id) 
+    process_invoice invoice
+  end
+  
+  # processes the invoice into the system
+  def self.process_invoice(invoice)
+
+    is_changed = false
     
     # 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)
-          i.qbo_invoice = QboInvoice.find_by_id(invoice.id.to_i)
-          i.save!
+
+          # 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!
+
+          # Attach the invoice to the issue
+          unless i.qbo_invoices.include?(qbo_invoice)
+            i.qbo_invoices << qbo_invoice
+            i.save!
+          end
+          
+          # update the invoive custom fields with infomation from the work ticket if available
+          invoice.custom_fields.each { |cf|
+            
+            # VIN from the attached vehicle
+            begin
+              if cf.name.eql? "VIN"
+                vin = Vehicle.find(i.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
+              #do nothing
+            end
+            
+            # Custom Values
+            begin
+              value = i.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
+                    break
+                  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
+                    break
+                  end
+                  
+                  # Everything else
+                  cf.string_value = value.value.to_s
+                  is_changed = true
+                end
+              end
+            rescue
+              # Nothing to do here, there is no match
+            end
+          }
         }
       end
     }
+    
+    # Push updates
+    get_base.update(invoice) if is_changed
   end
   
-  def self.update(id)
-    # Update the item table
-    invoice = get_base.service.fetch_by_id(id)
-      qbo_invoice = find_or_create_by(id: id)
-      qbo_invoice.doc_number = invoice.doc_number
-      qbo_invoice.save!
-  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'] == "BAD_REQUEST"
+        raise @details['message'] if @details['status'].to_s.eql? "NOT_FOUND" 
+        raise @details['message'] if @details['status'].to_s.eql? "BAD_REQUEST"
       rescue Exception => e
         errors.add(:vin, e.message)
       end

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/view.html.erb

@@ -0,0 +1,108 @@
+<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)  %>
+</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/_dropdown.html.erb

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

app/views/vehicles/_form.html.erb

@@ -34,7 +34,7 @@
         <div class="clearfix">
           VIN:
           <div class="input">
-            <%= f.text_field :vin %>
+            <%= f.text_field :vin , :autofocus => true %>
           </div>
         </div>
         

app/views/vehicles/update_vehicles.js.erb

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

assets/javascripts/update_vehicles.js.coffee

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

assets/javascripts/vehicles.js

@@ -1,16 +1,10 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
 
-$ ->
-  $(document).on 'change', '#issue_customer_id', (evt) ->
-    $.ajax 'update_vehicles',
-      type: 'GET'
-      dataType: 'script'
-      data: {
-        customer_id: $("#issue_customer_id option:selected").val()
-      }
-      error: (jqXHR, textStatus, errorThrown) ->
-        console.log("AJAX Error: #{textStatus}")
-      success: (data, textStatus, jqXHR) ->
-console.log("Dynamic vehicle select OK!")
+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/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

@@ -22,9 +22,13 @@ get 'qbo/sync', :to => 'qbo#sync'
 get 'qbo/estimate/:id', :to => 'estimate#show', as: :estimate
 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
-#get 'qbo/payments', :to => 'payments#new'
-#post 'qbo/payments', :to => 'payments#create'
 resources :payments
 
 #webhook

db/migrate/021_add_issues_qbo_invoices.rb

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

db/migrate/022_update_issues_remove_invoice.rb

@@ -8,10 +8,8 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module ActiveSupport::Callbacks::ClassMethods
-  def without_callback(*args, &block)
-    skip_callback(*args)
-    yield
-    set_callback(*args)
+class UpdateIssuesRemoveInvoice < ActiveRecord::Migration
+  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,17 +15,23 @@ 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'
    
    # 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'
+    
+    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.3.0'
+    version '0.4.1'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -41,7 +47,7 @@ Redmine::Plugin.register :redmine_qbo do
     
     # We are playing in the sandbox 
     #Quickbooks.sandbox_mode = true
-    
+
     # set per_page globally
     WillPaginate.per_page = 10
 

lib/header_footer_hook_listener.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 HeaderFooterHookListener < Redmine::Hook::ViewListener
+
+  def view_layouts_base_html_head(context = {})
+    #nothing
+  end
+
+  def view_layouts_base_body_bottom(context = {})
+    return "<div id='qbo_footer' align='center'><b>Last Sync: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
+  end
+end

lib/issue_patch.rb

@@ -23,9 +23,11 @@ module IssuePatch
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
       belongs_to :customer, primary_key: :id
-      belongs_to :qbo_item, primary_key: :id
+      belongs_to :customer_token, primary_key: :id
       belongs_to :qbo_estimate, primary_key: :id
-      belongs_to :qbo_invoice, primary_key: :id
+      has_and_belongs_to_many :qbo_invoices
+        #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
+  
       belongs_to :vehicle, primary_key: :id
     end
     
@@ -36,7 +38,62 @@ module IssuePatch
   end
   
   module InstanceMethods
+    
+    # Create billable time entries
+    def bill_time
+      
+      # Get unbilled time entries
+      spent_time = time_entries.where(qbo_billed: [false, nil])
+      spent_hours ||= spent_time.sum(:hours) || 0
+      
+      if spent_hours > 0 then
+      
+        # Prepare to create a new Time Activity
+        time_service = Qbo.get_base(:time_activity).service
+        item_service = Qbo.get_base(:item).service
+        time_entry = Quickbooks::Model::TimeActivity.new
   
+        h = Hash.new(0)
+        spent_time.each do |entry|
+          # Lets tottal up each activity
+          h[entry.activity.name] += entry.hours
+          # update time entries billed status
+          entry.qbo_billed = true
+          entry.save
+        end
+        
+        h.each do |key, val|
+          
+          # Convert float spent time to hours and minutes
+          hours = val.to_i
+          minutesDecimal = (( val - hours) * 60)
+          minutes = minutesDecimal.to_i
+          
+          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?}"
+          # TODO entry.user.qbo_employee.id
+          time_entry.employee_id = assigned_to.qbo_employee_id 
+          time_entry.customer_id = customer_id
+          time_entry.billable_status = "Billable"
+          time_entry.hours = hours
+          time_entry.minutes = minutes
+          time_entry.name_of = "Employee"
+          time_entry.txn_date = Date.today
+          time_entry.hourly_rate = item.unit_price
+          time_entry.item_id = item.id 
+          time_entry.start_time = start_date
+          time_entry.end_time = Time.now
+          time_service.create(time_entry)
+        end
+      end
+    end
+  end
+  
+  # Create a shareable link for a customer
+  def share_token
+    CustomerToken.create(:expires_at => Time.now + 24.hours, :issue_id => id)
   end
   
 end    

lib/issues_form_hook_listener.rb

@@ -12,7 +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 'vehicles', :plugin => 'redmine_qbo' 
+    #js += javascript_include_tag 'update_vehicles', :plugin => 'redmine_qbo'
+    return js
   end
   
   # Edit Issue Form
@@ -22,20 +24,16 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
  
     # Check to see if there is a quickbooks user attached to the issue
     selected_customer =  context[:issue].customer ? context[:issue].customer.id  : nil
-    selected_item = context[:issue].qbo_item ? context[:issue].qbo_item.id  : nil
-    selected_invoice = context[:issue].qbo_invoice ? context[:issue].qbo_invoice.id  : nil
     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
     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
-    
-    # Generate the drop down list of quickbooks items
-    select_item = f.select :qbo_item_id, QboItem.all.pluck(:name, :id).sort, :selected => selected_item, include_blank: true
-    
-    # Generate the drop down list of quickbooks invoices
-    select_invoice = f.select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_invoice, include_blank: true
+    select_customer = f.select :customer_id, 
+                        Customer.all.pluck(:name, :id).sort, 
+                        :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
@@ -48,6 +46,6 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     
     vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
     
-    return "<p>#{select_customer}</p> <p>#{select_item}</p> <p>#{select_invoice}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
+    return "<p>#{select_customer}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
   end
 end

lib/issues_save_hook_listener.rb

@@ -15,7 +15,7 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
     issue = context[:issue]
 
     # Check to see if we have registered with QBO
-    if Qbo.first && issue.customer && issue.qbo_item
+    if Qbo.first && issue.customer && issue. qbo_item_id
       
       # if this is a quote, lets create a new estimate based off estimated hours
         if issue.tracker.name = "Quote" && issue.status.name = "New" && issue.qbo_estimate
@@ -44,10 +44,6 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
 
           # Add the line items to the estimate
           estimate.line_items << line_item
-
-          # Save the etimate to the issue
-          #issue.qbo_estimate_id = estimate_base.service.create(estimate).id
-          #issue.save!
         end
       end
   end
@@ -55,55 +51,6 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
    # Called After Issue Saved
   def controller_issues_edit_after_save(context={})
     issue = context[:issue]
-    
-    if issue.assigned_to
-      employee_id = issue.assigned_to.qbo_employee_id
-
-      # Check to see if we have registered with QBO and if the issue is closed.
-      # If so then we need to create a new billable time activity for the customer
-      bill_time(issue, employee_id) if Qbo.first && issue.customer && issue.qbo_item && employee_id && issue.status.is_closed?
-    end
-  end
-    
-  # Create billable time entries
-  def bill_time(issue, employee_id)
-  
-    # Get unbilled time entries
-    spent_time = issue.time_entries.where(qbo_billed: [false, nil])
-    spent_hours ||= spent_time.sum(:hours) || 0
-    
-    if spent_hours > 0 then
-    
-      # Prepare to create a new Time Activity
-      time_service = Qbo.get_base(:time_activity).service
-      item_service = Qbo.get_base(:item).service
-      time_entry = Quickbooks::Model::TimeActivity.new
-    
-      # Convert float spent time to hours and minutes
-      hours  = spent_hours.to_i
-      minutesDecimal = (( spent_hours - hours) * 60)
-      minutes = minutesDecimal.to_i
-      
-      # update time entries billed status
-      spent_time.each do |entry|
-        entry.qbo_billed = true
-        entry.save
-      end
-    
-      item = item_service.fetch_by_id issue.qbo_item_id
-      time_entry.description = "#{issue.tracker} ##{issue.id}: #{issue.subject}"
-      time_entry.employee_id = employee_id
-      time_entry.customer_id = issue.customer_id
-      time_entry.billable_status = "Billable"
-      time_entry.hours = hours
-      time_entry.minutes = minutes
-      time_entry.name_of = "Employee"
-      time_entry.txn_date = Date.today
-      time_entry.hourly_rate = item.unit_price
-      time_entry.item_id = issue.qbo_item_id 
-      time_entry.start_time = issue.start_date
-      time_entry.end_time = Time.now
-      time_service.create(time_entry)
-    end
+    issue.bill_time if Qbo.first && issue.customer && issue.status.is_closed?
   end
 end

lib/issues_show_hook_listener.rb

@@ -19,15 +19,12 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
   # Display the quickbooks contact in the issue
   def view_issues_show_details_bottom(context={})
     issue = context[:issue]
-
+    
     # Check to see if there is a quickbooks user attached to the issue
     if issue.customer
       customer =  link_to issue.customer.name, "#{Redmine::Utils::relative_url_root}/customers/#{issue.customer.id}"
     end
     
-    # Check to see if there is a quickbooks item attached to the issue
-    item =  issue.qbo_item ? issue.qbo_item.name : nil
-    
     # Estimate Number
     if issue.qbo_estimate
       estimate =  issue.qbo_estimate.doc_number
@@ -35,12 +32,14 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     end
     
     # Invoice Number
-    if issue.qbo_invoice
-      invoice =  issue.qbo_invoice.doc_number
-      invoice_link = link_to invoice, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{issue.qbo_invoice.id}", :target => "_blank"
+    invoice_link = ""
+    if issue.qbo_invoice_ids
+      issue.qbo_invoice_ids.each do |i|
+        invoice = QboInvoice.find i
+        invoice_link = invoice_link + link_to( invoice.doc_number, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{i}", :target => "_blank").to_s + " "
+      end
     end
     
-    
     begin
       v = Vehicle.find(issue.vehicles_id)
       vehicle = link_to v.to_s, "#{Redmine::Utils::relative_url_root}/vehicles/#{v.id}"
@@ -53,45 +52,48 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     split_vin = vin.scan(/.{1,9}/) if vin
     
     return "
-    <div class=\"attributes\">
+    <div class=\"splitcontent\">
     
-      <div class=\"customer_id attribute\">
-        <div class=\"label\"><span>Customer</span>:</div>
-        <div class=\"value\">#{customer}</div>
-      </div>
-    
-      <div class=\"qbo_item_id attribute\">
-        <div class=\"label\"><span>Item</span>:</div>
-        <div class=\"value\">#{item}</div>
-      </div>
-
-      <div class=\"qbo_estimate_id attribute\">
-        <div class=\"label\"><span>Estimate</span>:</div>
-        <div class=\"value\">#{estimate_link}</div>
-      </div>
-        
-      <div class=\"qbo_invoice_id attribute\">
-        <div class=\"label\"><span>Invoice</span>:</div>
-        <div class=\"value\">#{invoice_link}</div>
+      <div class=\"splitcontentleft\">
+        <div class=\"customer_id attribute\">
+          <div class=\"label\"><span>Customer</span>:</div>
+          <div class=\"value\">#{customer}</div>
+        </div>
+  
+        <div class=\"qbo_estimate_id attribute\">
+          <div class=\"label\"><span>Estimate</span>:</div>
+          <div class=\"value\">#{estimate_link}</div>
+        </div>
+          
+        <div class=\"qbo_invoice_id attribute\">
+          <div class=\"label\"><span>Invoice</span>:</div>
+          <div class=\"value\">#{invoice_link}</div>
+        </div>
       </div>
       
-      <br/>
-
-      <div class=\"vehicle attribute\">
-        <div class=\"label\"><span>Vehicle</span>:</div>
-        <div class=\"value\">#{vehicle}</div>
-      </div>
+      <div class=\"splitcontentleft\">
+        <div class=\"vehicle attribute\">
+          <div class=\"label\"><span>Vehicle</span>:</div>
+          <div class=\"value\">#{vehicle}</div>
+        </div>
+          
+        <div class=\"vehicle_vin attribute\">
+          <div class=\"label\"><span>VIN</span>:</div>
+          <div class=\"value\">#{split_vin[0] if split_vin}<b>#{split_vin[1] if split_vin}</b></div>
+        </div>
         
-      <div class=\"vehicle_vin attribute\">
-        <div class=\"label\"><span>VIN</span>:</div>
-        <div class=\"value\">#{split_vin[0] if split_vin}<b>#{split_vin[1] if split_vin}</b></div>
-      </div>
-      
-      <div class=\"vehicle_notes attribute\">
-        <div class=\"label\"><span>Notes</span>:</div>
-        <div class=\"value\">#{notes}</div>
+        <div class=\"vehicle_notes attribute\">
+          <div class=\"label\"><span>Notes</span>:</div>
+          <div class=\"value\">#{notes}</div>
+        </div>
       </div>
     </div>"
   end
   
+  def view_issues_show_description_bottom(context={})
+    bill_button = button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get if User.current.admin?
+    share_button = button_to "Share", "#{Redmine::Utils::relative_url_root}/customers/view/#{context[:issue].share_token.token}", method: :get if User.current.logged?
+    return "<br/> #{bill_button} #{share_button}"
+  end
+  
 end

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}.name", :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