Version bump 0.3.0

* Added Payments
* Other things that I don't remember...

Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'quickbooks-ruby', :git => 'https://github.com/rickbarrette/quickbooks-ruby.git'
+gem 'quickbooks-ruby'
 gem 'quickbooks-ruby-base'
-gem 'oauth-plugin'#, '~> 0.5.1'
+gem 'oauth-plugin'
 gem 'oauth'
 gem 'roxml'
-gem 'nokogiri'
+gem 'edmunds_vin'
+gem 'will_paginate', '~> 3.1.0'

README.md

@@ -20,6 +20,8 @@ The goal of this project is to allow redmine to connect with Quickbooks Online t
 
 * Sign up to become a developer for Intuit https://developer.intuit.com/
 * Create your own aplication to obtain your API keys
+* Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
+  - See https://developer.intuit.com/docs/0100_accounting/0300_developer_guides/webhooks
 
 ##The Install
 
@@ -47,15 +49,13 @@ The goal of this project is to allow redmine to connect with Quickbooks Online t
   
   ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
 
-Note: Customers, Employees, and Service Items with automaticly update during normal usage of redmine i.e. a page refresh. You can also manualy force redmine to sync its database with QBO clicking the sync link in the Quickbooks top menu page 
-
-  ![Alt plugin_top_menu](/Screenshots/plugin_top_menu.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 ~~Creation~~, ~~Update~~, 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 link Invoice PDF to issue after creation.
-  * Clean up view hook code, possibly use a controller hook and reder partial views
   * Add Setting for Sandbox Mode
 
 ##License

app/controllers/customers_controller.rb

@@ -0,0 +1,105 @@
+#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.
+
+# This controller class will handle map management
+class CustomersController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_filter :require_user
+  
+  default_search_scope :names
+  
+  # display a list of all customers
+  def index
+    if params[:search]
+      @customers = Customer.search(params[:search]).paginate(:page => params[:page])
+      if only_one_non_zero?(@customers)
+        redirect_to @customers.first
+      end
+    end
+  end
+  
+  def new
+    @customer = Customer.new
+  end
+  
+  def create
+    @customer = Customer.new(params[:customer])
+    if @customer.save
+      flash[:notice] = "New Customer Created"
+      redirect_to @customer
+    else
+      flash[:error] = @customer.errors.full_messages.to_sentence 
+      redirect_to new_customer_path
+    end
+  end
+  
+  # display a specific customer
+  def show
+    begin
+      @customer = Customer.find_by_id(params[:id])
+      @vehicles = @customer.vehicles.paginate(:page => params[:page])
+      @issues = @customer.issues
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # return an HTML form for editing a customer
+  def edit
+    begin
+      @customer = Customer.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # update a specific customer
+  def update
+    begin
+      @customer = Customer.find_by_id(params[:id])
+      if @customer.update_attributes(params[:customer])
+        flash[:notice] = "Customer updated"
+        redirect_to @customer
+      else
+        redirect_to edit_customer_path
+        flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
+      end
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  def destroy
+    begin
+      Customer.find_by_id(params[:id]).destroy
+      flash[:notice] = "Customer deleted successfully"
+      redirect_to action: :index
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  private
+  
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      if val!=0
+        return false if found_non_zero
+        found_non_zero = true
+      end
+    end
+    found_non_zero
+  end
+
+end

app/controllers/estimate_controller.rb

@@ -10,13 +10,18 @@
 class EstimateController < ApplicationController
   unloadable
   
+  include AuthHelper
+  
+  before_filter :require_user
+  
   #
   # Downloads and forwards the estimate pdf
   #
   def show
     base = QboEstimate.get_base.service
-    @pdf = base.pdf(base.fetch_by_id(params[:id]))
-    send_data @pdf, filename: "estimate.pdf", :disposition => 'inline', :type => "application/pdf"
+    estimate = base.fetch_by_id(params[:id])
+    @pdf = base.pdf(estimate)
+    send_data @pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
   end
 
 end

app/controllers/invoice_controller.rb

@@ -9,13 +9,18 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class InvoiceController < ApplicationController
   unloadable
-
-   #
+  
+  include AuthHelper
+  
+  before_filter :require_user
+  
+  #
   # Downloads and forwards the invoice pdf
   #
   def show
     base = QboInvoice.get_base.service
-    @pdf = base.pdf(base.fetch_by_id(params[:id]))
-    send_data @pdf, filename: "invoice.pdf", :disposition => 'inline', :type => "application/pdf"
+    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"
   end
 end

app/controllers/payments_controller.rb

@@ -0,0 +1,51 @@
+#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 PaymentsController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_filter :require_user
+
+  def new
+    @payment = Payment.new
+    
+    @customers = Customer.all
+    
+    @accounts = Qbo.get_base(:account).service.query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' ")
+    
+    @payment_methods = Qbo.get_base(:payment_method).service.all
+  end
+  
+  def create
+    @payment = Payment.new(params[:payment])
+    if @payment.save
+      flash[:notice] = "Payment Saved"
+      redirect_to Customer.find_by_id(@payment.customer_id)
+    else
+      flash[:error] = @payment.errors.full_messages.to_sentence 
+      redirect_to new_customer_path
+end
+  end
+  
+  private
+  
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      if val!=0
+        return false if found_non_zero
+        found_non_zero = true
+      end
+    end
+    found_non_zero
+  end
+
+end

app/controllers/qbo_controller.rb

@@ -10,13 +10,20 @@
 
 class QboController < ApplicationController
   unloadable
+  
+  require 'openssl'
+  
+  include AuthHelper
+  
+  before_filter :require_user, :except => :qbo_webhook
+  skip_before_filter :verify_authenticity_token, :check_if_login_required
 
   #
   # Called when the QBO Top Menu us shown
   #
   def index
     @qbo = Qbo.first
-    @qbo_customer_count = QboCustomer.count
+    @customer_count = Customer.count
     @qbo_item_count = QboItem.count
     @qbo_employee_count = QboEmployee.count
     @qbo_invoice_count = QboInvoice.count
@@ -27,9 +34,9 @@ class QboController < ApplicationController
   # Called when the user requests that Redmine to connect to QBO
   #
   def authenticate
-    callback = request.base_url + qbo_oauth_callback_path
+    callback = qbo_oauth_callback_url
     token = Qbo.get_oauth_consumer.get_request_token(:oauth_callback => callback)
-    session[:qb_request_token] = token
+    session[:qb_request_token] = Marshal.dump(token)
     redirect_to("https://appcenter.intuit.com/Connect/Begin?oauth_token=#{token.token}") and return
   end
 
@@ -37,27 +44,74 @@ class QboController < ApplicationController
   # Called by QBO after authentication has been processed
   #
   def oauth_callback
-    at = session[:qb_request_token].get_access_token(:oauth_verifier => params[:oauth_verifier])
-    token = at.token
-    secret = at.secret
-    realm_id = params['realmId']
+    at = Marshal.load(session[:qb_request_token]).get_access_token(:oauth_verifier => params[:oauth_verifier])
     
     #There can only be one...
     Qbo.destroy_all
 
     # Save the authentication information 
     qbo = Qbo.new
-    qbo.token = token
-    qbo.secret = secret
+    qbo.qb_token = at.token
+    qbo.qb_secret = at.secret
     qbo.token_expires_at = 6.months.from_now.utc
     qbo.reconnect_token_at = 5.months.from_now.utc
-    qbo.realmId = realm_id
+    qbo.company_id = params['realmId']
     if qbo.save!
-      redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
+      redirect_to qbo_path, :flash => { :notice => "Successfully connected to Quickbooks" }
     else
       redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
     end
-
+  end
+  
+  # Quickbooks Webhook Callback
+  def qbo_webhook
+    
+    # check the payload
+    signature = request.headers['intuit-signature']
+    key = Setting.plugin_redmine_qbo['settingsWebhookToken']
+    data = request.body.read
+    hash = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, data)).strip()
+    
+    # proceed if the request is good
+    if hash.eql? signature
+      if request.headers['content-type'] == 'application/json'
+        data = JSON.parse(data)
+      else
+        # application/x-www-form-urlencoded
+        data = params.as_json
+      end
+      # Process the information
+      entities = data['eventNotifications'][0]['dataChangeEvent']['entities']
+      entities.each do |entity|
+        id = entity['id'].to_i
+        name = entity['name']
+        
+        # TODO rename all other models!
+        name.prepend("Qbo") if not name.eql? "Customer"
+        
+        # Magicly initialize the correct class
+        obj = name.constantize
+        
+        # for merge events
+        obj.destroy(entity['deletedId']) if entity['deletedId']
+        
+        #Check to see if we are deleting a record
+        if entity['operation'].eql? "Delete"
+            obj.destroy(id)
+        #if not then update!
+        else
+          obj.sync_by_id(id)
+        end
+      end
+      
+      # Record that last time we updated
+      Qbo.update_time_stamp
+      
+      # The webhook doesn't require a response but let's make sure we don't send anything
+      render :nothing => true
+    else
+      render nothing: true, status: 400
+    end
   end
 
   #
@@ -65,14 +119,16 @@ class QboController < ApplicationController
   #
   def sync
     if Qbo.exists?
-      QboCustomer.update_all
-      QboItem.update_all
-      QboEmployee.update_all
-      QboEstimate.update_all
-      QboInvoice.update_all
-      QboPurchase.update_all
+      Customer.sync
+      QboItem.sync
+      QboEmployee.sync
+      QboEstimate.sync
+      QboInvoice.sync
+      
+      # Record the last sync time
+      Qbo.update_time_stamp
     end
 
     redirect_to qbo_path(:redmine_qbo), :flash => { :notice => "Successfully synced to Quickbooks" }
   end
-end
+end

app/controllers/vehicles_controller.rb

@@ -0,0 +1,126 @@
+#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.
+
+# This controller class will handle map management
+class VehiclesController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_filter :require_user
+  
+  # display a list of all vehicles
+  def index
+    if params[:customer_id]
+      begin
+        @vehicles = Customer.find_by_id(params[:customer_id]).vehicles.paginate(:page => params[:page])
+      rescue ActiveRecord::RecordNotFound
+        render_404
+      end
+    end
+    
+    if params[:search]
+      @vehicles = Vehicle.search(params[:search]).paginate(:page => params[:page])
+      if only_one_non_zero?(@vehicles)
+        redirect_to @vehicles.first
+      end
+    end
+  end
+
+  # return an HTML form for creating a new vehicle
+  def new
+    @vehicle = Vehicle.new
+    @customers = Customer.all.order(:name)
+    @customer = params[:customer_id] if params[:customer_id]
+  end
+
+  # create a new vehicle
+  def create
+    @vehicle = Vehicle.new(params[:vehicle])
+    if @vehicle.save
+      flash[:notice] = "New Vehicle Created"
+      redirect_to @vehicle
+    else
+      flash[:error] = @vehicle.errors.full_messages.to_sentence 
+      redirect_to new_vehicle_path
+    end
+  end
+  
+  # display a specific vehicle
+  def show
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # return an HTML form for editing a vehicle
+  def edit
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+      @customer = @vehicle.customer.id
+      @customers = Customer.all.order(:name)
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # update a specific vehicle
+  def update
+    @customer = params[:customer]
+    begin   
+      @vehicle = Vehicle.find_by_id(params[:id])
+      if @vehicle.update_attributes(params[:vehicle])
+        flash[:notice] = "Vehicle updated"
+        redirect_to @vehicle
+      else
+        flash[:error] = @vehicle.errors.full_messages.to_sentence if @vehicle.errors
+        redirect_to edit_vehicle_path
+      end
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end  
+
+  # delete a specific vehicle
+  def destroy
+    begin
+      Vehicle.find_by_id(params[:id]).destroy
+      flash[:notice] = "Vehicle deleted successfully"
+      redirect_to action: :index
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # returns a dynamic list of vehicles owned by a customer
+  def update_vehicles
+    @vehicles = Customer.find_by_id(params[:customer_id].to_i).vehicles
+    respond_to do |format|
+      format.html { render(:text => "not implemented") }
+      format.js
+    end
+  end
+  
+  private
+  
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      if val!=0
+        return false if found_non_zero
+        found_non_zero = true
+      end
+    end
+    found_non_zero
+  end
+
+end

app/helpers/auth_helper.rb

@@ -8,11 +8,11 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module QboHelper
-
-  def qbo_customer_dropdown
-    select = context[:form].select :qbo_customer_id, QboCustomers.all.pluck(:name, :id), :selected => selected, include_blank: true
-    return "<p>#{select}</p>"
-  end 
+module AuthHelper
 
+  def require_user
+    if !User.current.logged?
+      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true
+    end
+  end
 end

app/helpers/estimate_helper.rb

@@ -1,2 +0,0 @@
-module EstimateHelper
-end

app/helpers/invoice_helper.rb

@@ -1,2 +0,0 @@
-module InvoiceHelper
-end

app/helpers/without_callback.rb

@@ -0,0 +1,17 @@
+#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.
+
+module ActiveSupport::Callbacks::ClassMethods
+  def without_callback(*args, &block)
+    skip_callback(*args)
+    yield
+    set_callback(*args)
+  end
+end

app/models/customer.rb

@@ -0,0 +1,206 @@
+#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 Customer < ActiveRecord::Base
+  unloadable
+  
+  has_many :issues
+  has_many :qbo_purchases
+  has_many :vehicles
+  
+  attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone
+  validates_presence_of :id, :name
+  
+  self.primary_key = :id
+  
+  # returns a human readable string
+  def to_s
+    return name
+  end
+  
+  # Convenience Method
+  # returns the customer's email
+  def email
+    pull unless @details
+    begin
+      return @details.email_address.address
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Sets the email
+  def email=(s)
+    pull unless @details
+    @details.email_address = s
+  end
+  
+  # Convenience Method
+  # returns the customer's primary phone
+  def primary_phone
+    pull unless @details
+    begin
+      return @details.primary_phone.free_form_number
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Updates the customer's primary phone number
+  def primary_phone=(n)
+    pull unless @details
+    pn = Quickbooks::Model::TelephoneNumber.new
+    pn.free_form_number = n
+    @details.primary_phone = pn
+  end
+  
+  # Convenience Method
+  # returns the customer's mobile phone
+  def mobile_phone
+    pull unless @details
+    begin
+      return @details.mobile_phone.free_form_number
+    rescue
+      return nil
+    end
+  end
+  
+  # Convenience Method
+  # Updates the custome's mobile phone number
+  def mobile_phone=(n)
+    pull unless @details
+    pn = Quickbooks::Model::TelephoneNumber.new
+    pn.free_form_number = n
+    @details.mobile_phone = pn
+  end
+  
+  # Convenience Method
+  # Updates Both local DB name & QBO display_name
+  def name=(s)
+    pull unless @details
+    @details.display_name = s
+    super
+  end
+  
+  # Magic Method
+  # Maps Get/Set methods to QBO customer object
+  def method_missing(sym, *arguments)  
+    # Check to see if the method exists
+    if Quickbooks::Model::Customer.method_defined?(sym)
+      # download details if required
+      pull unless @details
+      method_name = sym.to_s
+      # Setter
+      if method_name[-1, 1] == "="  
+        @details.method(method_name).call(arguments[0])  
+      # Getter
+      else  
+        return @details.method(method_name).call 
+      end
+    end  
+  end  
+  
+  # proforms a bruteforce sync operation
+  # This needs to be simplified
+  def self.sync 
+    service = Qbo.get_base(:customer).service
+
+    # Sync ALL customers if the database is empty
+    #if count == 0
+      customers = service.all
+    #else
+    #  last = Qbo.first.last_sync
+    #  query = "Select Id, DisplayName From Customer"
+    #  query << " Where Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
+    #  customers = service.query(query)
+    #end
+    
+    customers.each do |customer|
+      qbo_customer = Customer.find_or_create_by(id: customer.id)
+      if customer.active?
+        if not qbo_customer.name.eql? customer.display_name
+          qbo_customer.name = customer.display_name
+          qbo_customer.id = customer.id
+          qbo_customer.save_without_push
+        end
+      else
+        if not qbo_customer.new_record?
+          qbo_customer.delete
+        end
+      end
+    end
+  end
+  
+  # Searchs the database for a customer by name
+  def self.search(search)
+    customers = where("name LIKE ?", "%#{search}%")
+    
+    #if customers.empty?
+    #  service = Qbo.get_base(:customer).service
+    #  results = service.query("Select Id From Customer Where PrimaryPhone LIKE '%#{search}%' AND Mobile LIKE '%#{search}%'")
+      
+    #  results.each do |customer| 
+    #    customers << Customer.find_by_id(customer.id)
+    #  end
+    #end
+    
+    return customers.order(:name)
+  end
+  
+  # proforms a bruteforce sync operation
+  # This needs to be simplified
+  def self.sync_by_id(id) 
+    service = Qbo.get_base(:customer).service
+
+    customer = service.fetch_by_id(id)
+    qbo_customer = Customer.find_or_create_by(id: customer.id)
+    if customer.active?
+      if not qbo_customer.name.eql? customer.display_name
+        qbo_customer.name = customer.display_name
+        qbo_customer.id = customer.id
+        qbo_customer.save_without_push
+      end
+    else
+      if not qbo_customer.new_record?
+        qbo_customer.delete
+      end
+    end
+  end
+  
+  # Push the updates
+  def save_with_push
+    begin
+      @details = Qbo.get_base(:customer).service.update(@details)
+      #raise "QBO Fault" if @details.fault?
+      self.id = @details.id
+    rescue Exception => e
+      errors.add(e.message)
+    end
+    save_without_push
+  end
+  
+  alias_method :save_without_push, :save
+  alias_method :save, :save_with_push
+  
+  private
+  
+  # pull the details
+  def pull
+    begin
+      raise Exception unless self.id
+      @details = Qbo.get_base(:customer).find_by_id(self.id)
+    rescue Exception => e
+      @details = Quickbooks::Model::Customer.new
+    end
+  end
+  
+end

app/models/payment.rb

@@ -8,35 +8,30 @@
 #
 #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 QboCustomer < ActiveRecord::Base
+class Payment
   unloadable
-  has_many :issues
-  has_many :qbo_purchases
-  attr_accessible :name
-  validates_presence_of :id, :name
   
-   def self.get_base
-    Qbo.get_base(:customer)
+  include ActiveModel::Model
+  
+  attr_accessor :errors, :customer_id, :account_id, :payment_method_id, :total_amount
+  validates_presence_of :customer_id, :account_id, :payment_method_id, :total_amount
+  validates :total_amount, numericality: true
+  
+  def save
+    payment = Quickbooks::Model::Payment.new
+    payment.customer_id = @customer_id.to_i
+    payment.deposit_to_account_id = @account_id.to_i
+    payment.payment_method_id = @payment_method_id.to_i
+    payment.total = @total_amount
+    Qbo.get_base(:payment).service.update(payment)
   end
-   
-  def self.get_customer (id)
-    get_base.service.find_by_id(id)
+  
+  def save!
+    save
   end
 
-  def self.update_all 
-    customers = get_base.service.all
-
-    transaction do
-      # Update the customer table
-      customers.each { |customer|
-        qbo_customer = QboCustomer.find_or_create_by(id: customer.id)
-        qbo_customer.name = customer.display_name
-        qbo_customer.id = customer.id
-        qbo_customer.save!
-      }
-    end
-   
-    #remove deleted customers
-    where.not(customers.map(&:id)).destroy_all
+  # Dummy stub to make validtions happy.
+  def update_attribute
   end
+
 end

app/models/qbo.rb

@@ -11,24 +11,28 @@
 class Qbo < ActiveRecord::Base
   unloadable
   validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
-
-  QB_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
-  QB_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
-
-  # Quickbooks Config Info
-  $qb_oauth_consumer = OAuth::Consumer.new(QB_KEY, QB_SECRET, {
-    :site                 => "https://oauth.intuit.com",
-    :request_token_path   => "/oauth/v1/get_request_token",
-    :authorize_url        => "https://appcenter.intuit.com/Connect/Begin",
-    :access_token_path    => "/oauth/v1/get_access_token"
-  })
-
+  
+  OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
+  OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
+  
+  $qb_oauth_consumer = OAuth::Consumer.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, {
+      :site                 => "https://oauth.intuit.com",
+      :request_token_path   => "/oauth/v1/get_request_token",
+      :authorize_url        => "https://appcenter.intuit.com/Connect/Begin",
+      :access_token_path    => "/oauth/v1/get_access_token"
+    })
+    
   # Configure quickbooks-ruby-base to access our database
   Quickbooks::Base.configure do |c|
-      c.persistent_token = 'qb_token'
-      c.persistent_secret = 'qb_secret'
-      c.persistent_company_id =  'company_id'
-   end
+    c.persistent_token = 'qb_token'
+    c.persistent_secret = 'qb_secret'
+    c.persistent_company_id =  'company_id'
+  end
+   
+  def self.get_oauth_consumer
+    # Quickbooks Config Info
+    return $qb_oauth_consumer
+  end
 
   # Get a quickbooks base object for type
   # @params type of base
@@ -40,4 +44,15 @@ class Qbo < ActiveRecord::Base
   def self.get_account
     first
   end
+  
+  # Updates last sync time stamp
+  def self.update_time_stamp
+    qbo = Qbo.first
+    qbo.last_sync = DateTime.now
+    qbo.save
+  end
+  
+  def self.last_sync
+    format_time(Qbo.first.last_sync)
+  end
 end

app/models/qbo_employee.rb

@@ -18,7 +18,7 @@ class QboEmployee < ActiveRecord::Base
     Qbo.get_base(:employee)
   end
   
-  def self.update_all 
+  def self.sync 
     employees = get_base.service.all
     
     transaction do
@@ -30,8 +30,13 @@ class QboEmployee < ActiveRecord::Base
         qbo_employee.save!
       }
     end
-    
-    #remove deleted employees
-    where.not(employees.map(&:id)).destroy_all
+  end
+
+  def self.sync_by_id(id)
+    employee = get_base.service.fetch_by_id(id)
+    qbo_employee = find_or_create_by(id: employee.id)
+    qbo_employee.name = employee.display_name
+    qbo_employee.id = employee.id
+    qbo_employee.save!
   end
 end

app/models/qbo_estimate.rb

@@ -18,7 +18,7 @@ class QboEstimate < ActiveRecord::Base
     Qbo.get_base(:estimate)
   end
   
-  def self.update_all 
+  def self.sync 
     estimates = get_base.service.all
   
     # Update the item table
@@ -35,6 +35,14 @@ class QboEstimate < ActiveRecord::Base
     where.not(estimates.map(&:id)).destroy_all
   end
   
+  def self.sync_by_id(id)
+    estimate = get_base.service.fetch_by_id(id)
+    qbo_estimate = QboEstimate.find_or_create_by(id: estimate.id)
+    qbo_estimate.doc_number = estimate.doc_number
+    qbo_estimate.id = estimate.id
+    qbo_estimate.save!
+  end
+  
   def self.update(id)
     # Update the item table
     estimate = get_base.service.fetch_by_id(id)

app/models/qbo_invoice.rb

@@ -18,22 +18,51 @@ class QboInvoice < ActiveRecord::Base
     Qbo.get_base(:invoice)
   end
   
-  def self.update_all
+  def self.sync
     #Pull the invoices from the quickbooks server
-    invoices = get_base.service.all
+    #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 
+    else
+      invoices = get_base.service.query()
+    end
     
     # Update the invoice table 
-    transaction do
-      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! 
-      }
-    end 
+    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! 
+    }
     
     #remove deleted invoices 
-    where.not(invoices.map(&:id)).destroy_all
+    #where.not(invoices.map(&:id)).destroy_all
+  end
+  
+  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! 
+    
+    # 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!
+        }
+      end
+    }
   end
   
   def self.update(id)

app/models/qbo_item.rb

@@ -13,25 +13,35 @@ class QboItem < ActiveRecord::Base
   has_many :issues
   attr_accessible :name
   validates_presence_of :id, :name
-  
+
+  self.primary_key = :id
+
   def self.get_base
     Qbo.get_base(:item)
   end
   
-  def self.update_all 
-    items = get_base.service.find_by(:type, "Service")
-        
-    transaction do
-      # Update the item table
-      items.each { |item|
-        qbo_item = QboItem.find_or_create_by(id: item.id)
-        qbo_item.name = item.name
-        qbo_item.id = item.id
-        qbo_item.save!
+  def self.sync 
+    last = Qbo.first.last_sync
+
+    query = "SELECT Id, Name FROM Item WHERE Type = 'Service' "
+    query << " AND  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last 
+   
+    if count == 0
+      items = get_base.service.all
+    else
+      items = get_base.service.query(query)
+    end
+
+    unless items.count = 0
+      items.find_by(:type, "Service").each { |i|
+        qbo_item = QboItem.find_or_create_by(id: i.id)
+        qbo_item.name = i.name
+        qbo_item.id = i.id
+        qbo_item.save
       }
     end
-    
-    #remove deleted items
-    where.not(items.map(&:id)).destroy_all
+      
+#    QboItem.where.not(items.map(&:id)).destroy_all
   end
+  
 end

app/models/qbo_purchase.rb

@@ -19,11 +19,11 @@ class QboPurchase < ActiveRecord::Base
     Qbo.get_base(:purchase)
   end
 
-  def self.get_purchase(id)
+  def get_purchase(id)
     get_base.service.find_by_id(id)
   end
 
-  def self.update_all
+  def self.sync
    QboPurchase.get_base.service.all.each { |purchase|
       
       purchase.line_items.all? { |line_item|

app/models/vehicle.rb

@@ -0,0 +1,130 @@
+#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 Vehicle < ActiveRecord::Base
+  
+  unloadable
+  
+  API_KEY = Setting.plugin_redmine_qbo['settingsEdmundsAPIKey']
+  
+  belongs_to :customer
+  has_many :issues, :foreign_key => 'vehicles_id'
+  
+  attr_accessible :year, :make, :model, :customer_id, :notes, :vin
+  
+  validates_presence_of :customer
+  validates :vin, uniqueness: true
+  #validates :year, numericality: { only_integer: true }
+  
+  before_save :decode_vin
+  after_initialize :get_details
+  
+  self.primary_key = :id
+  
+  # returns a human readable string
+  def to_s
+    return "#{year} #{make} #{model}"
+  end
+  
+  # returns the raw JSON details from EMUNDS
+  def details
+    return @details
+  end
+  
+  # returns the style of the vehicle
+  def style
+    begin
+      return @details['years'][0]['styles'][0]['name'] if @details
+    rescue
+      return nil
+    end
+  end
+  
+  # returns the drive of the vehicle i.e. 2 wheel, 4 wheel, ect.
+  def drive
+    return @details['drivenWheels'].to_s.upcase if @details
+  end
+  
+  # returns the number of doors of the vehicle
+  def doors
+    return @details['numOfDoors'] if @details
+  end
+  
+  # Force Upper Case for VIN numbers
+  def make=(val)
+    # The to_s is in case you get nil/non-string
+    write_attribute(:make, val.to_s.titleize)
+  end
+  
+  # Force Upper Case for VIN numbers
+  def model=(val)
+    # The to_s is in case you get nil/non-string
+    write_attribute(:model, val.to_s.titleize)
+  end
+  
+  # Force Upper Case for VIN numbers
+  def vin=(val)
+    # The to_s is in case you get nil/non-string
+    write_attribute(:vin, val.to_s.scan(/^[A-Za-z0-9]+$/).join.upcase)
+  end
+  
+  # search for a vin
+  def self.search(search)
+    where("vin LIKE ?", "%#{search}%")
+  end
+  
+  private
+  
+  # init method to pull JSON details from Edmunds
+  def get_details
+    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"
+      rescue Exception => e
+        errors.add(:vin, e.message)
+      end
+    end
+  end
+  
+  # returns the Edmunds decoder service
+  def get_decoder
+    #TODO API Code via Settings
+    return decoder = Edmunds::Vin.new(API_KEY)
+  end
+  
+  # decodes a vin and updates self
+  def decode_vin
+    get_details
+    if @details
+      begin
+        self.year = @details['years'][0]['year']
+        self.make = @details['make']['name']
+        self.model = @details['model']['name']
+      rescue Exception => e
+        errors.add(:vin, e.message)
+      end
+    end
+    self.name = to_s
+  end
+  
+  # makes a squishvin
+  # https://api.edmunds.com/api/vehicle/v2/squishvins/#{vin}/?fmt=json&api_key=#{ENV['edmunds_key']}
+  def vin_squish
+    if not self.vin? or self.vin.size < 11
+      # this is to go ahead and query the API, letting them handle the error. :P
+      return '1000000000A'
+    end
+    v = self.vin[0,11]
+    return v.slice(0,8) + v.slice(9,11)
+  end
+  
+end

app/views/customers/_details.html.erb

@@ -0,0 +1,59 @@
+<table>
+  <tbody>
+    <tr>
+      <th>Customer</th>
+      <td><%= customer.name %></td>
+    </tr>
+    
+    <tr>
+      <th>Email</th>
+      <td><%= customer.email %></td>
+    </tr>
+    
+    <tr>
+      <th>Primary Phone</th>
+      <td><%= number_to_phone(customer.primary_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.primary_phone %></td>
+    </tr>
+    
+    <tr>
+      <th>Mobile Phone</th>
+      <td><%= number_to_phone(customer.mobile_phone.gsub(/[^\d]/, '').to_i, area_code: true) if customer.mobile_phone %></td>
+    </tr>
+    
+     <tr>
+        <th>Bill Address</th>
+        <td><%= customer.billing_address %></td>
+    </tr>
+    
+     <tr>
+        <th>Shipping Address</th>
+        <td><%= customer.shipping_address %></td>
+    </tr>
+    
+    <tr>
+        <th>Issues</th>
+        <td><%= customer.issues.count %></td>
+    </tr>
+    
+    <tr>
+        <th>Account Balance</th>
+        <td>$<%= customer.balance %></td>
+    </tr>
+    
+    <tr>
+        <th>Balance With Jobs</th>
+        <td>$<%= customer.balance_with_jobs %></td>
+    </tr>
+    
+    <tr>
+      <th>Notes</th>
+      <td><%= customer.notes %></td>
+    </tr>
+    
+    <tr>
+      <td>
+        <%= button_to "Edit Customer", edit_customer_path(customer), method: :get%> 
+      </td>
+    </tr>
+  </tbody>
+</table>

app/views/customers/_form.html.erb

@@ -0,0 +1,60 @@
+<div class="row">
+  <div class="span6 columns">
+    <fieldset>
+
+      <%= form_for @customer do |f| %> 
+       
+        <div class="clearfix">
+          Display Name: 
+          <div class="input">
+            <%= f.text_field :name, :required => true %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Phone Number:
+          <div class="input">
+            <%= f.telephone_field :primary_phone %>
+          </div>
+        </div>
+        
+       <div class="clearfix">
+          Mobile Phone Number:
+          <div class="input">
+            <%= f.telephone_field :mobile_phone %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Email:
+          <div class="input">
+            <%= f.email_field :email %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Notes: 
+          <div class="input">
+            <p>  
+              <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @customer.new_record? %>
+              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@customer.new_record? ? nil : 'display:none') do %>
+              <%= f.text_area :notes,
+                    :cols => 60,
+                    :rows => 10,
+                    :accesskey => accesskey(:edit),
+                    :class => 'wiki-edit',
+                    :no_label => true %>
+              <% end %>
+            </p>
+            <%= wikitoolbar_for 'issue_description' %>
+          </div>
+        </div>
+        
+       <div class="actions">
+        <%= f.submit %>
+       </div>
+      <% end %>
+
+    </fieldset>
+  </div>
+</div>

app/views/customers/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Edit Customer</h1> 
+<br/> 
+<%= render :partial => 'customers/form' %>

app/views/customers/index.html.erb

@@ -0,0 +1,28 @@
+<h1>Customers</h1> 
+<br/> 
+<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
+<%= text_field_tag :search, params[:search], placeholder: "Search Customers" %>
+<%= submit_tag "Search" %>
+<% end %>
+<br/>
+<% if @customers.present? %>
+  <br/>
+  <% @customers.each do |c| %>
+    <div class="row">
+      <div class="span6 columns">
+        <%= link_to c, customer_path(c.id) %>
+      </div>
+    </div>
+  <% end %>
+
+<div class="actions">
+  <%= will_paginate @customers %>
+</div>
+
+<% else %>
+  <p>There are no customers containing the term(s) <%= params[:search] %>.</p>
+<% end %>
+
+<div>
+  <%= Customer.count %> Customers - <b>Last Sync: </b> <%= Qbo.last_sync %>
+</div>

app/views/customers/new.html.erb

@@ -0,0 +1,3 @@
+<h1>New Customer</h1> 
+<br/>
+<%= render :partial => 'customers/form' %>

app/views/customers/show.html.erb

@@ -0,0 +1,12 @@
+<h1>Customer #<%= @customer.id %></h1> 
+<br/> 
+<h2>Details:</h2>
+<%= render :partial => 'customers/details', locals: {customer: @customer} %>
+<br/>
+<h2>Vehicles:</h2>
+<%= render :partial => 'vehicles/list' %>
+<%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
+<br/>
+<br/>
+<h2>Issues:</h2>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues} %>

app/views/payments/_form.html.erb

@@ -0,0 +1,42 @@
+<div class="row">
+  <div class="span6 columns">
+    <fieldset>
+
+      <%= form_for @payment do |f| %> 
+       
+        <div class="clearfix">
+          Customer: 
+          <div class="input">
+            <%= f.collection_select :customer_id, @customers, :id, :name, include_blank: true, :selected => @customer, :required => true%>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Deposit to Account: 
+          <div class="input">
+            <%= f.collection_select :account_id, @accounts, :id, :name, include_blank: true, :selected => @account, :required => true%>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Payment Method: 
+          <div class="input">
+            <%= f.collection_select :payment_method_id, @payment_methods, :id, :name, include_blank: true, :selected => @payment_method, :required => true%>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Amount: 
+          <div class="input">
+            <%= f.number_field :total_amount %>
+          </div>
+        </div>
+        
+       <div class="actions">
+        <%= f.submit %>
+       </div>
+      <% end %>
+
+    </fieldset>
+  </div>
+</div>

app/views/payments/new.html.erb

@@ -0,0 +1,3 @@
+<h1>New Payment</h1> 
+<br/>
+<%= render :partial => 'payments/form' %>

app/views/public/401.html.erb

@@ -0,0 +1 @@
+<%= flash.now[:error] = "Not Authorized" %>

app/views/qbo/_settings.html.erb

@@ -10,10 +10,27 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 -->
 
+<!-- somewhere in your document include the Javascript -->
+<script type="text/javascript" src="https://appcenter.intuit.com/Content/IA/intuit.ipp.anywhere.js"></script>
+
+<!-- configure the Intuit object: 'grantUrl' is a URL in your application which kicks off the flow, see below -->
+<script>
+intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_authenticate_url %>'});
+</script>
+
 <table >
   <tbody>
     <tr>
-      <th>OAuth Consumer Key</th>
+      <th>Edmunds API Key</th>
+      <td>
+        <input type="text" style="width:350px" id="settingsEdmundsAPIKey" 
+                           value="<%= settings['settingsEdmundsAPIKey'] %>" 
+                           name="settings[settingsEdmundsAPIKey]" >
+      </td>
+    </tr>
+  
+    <tr>
+      <th>Intuit QBO OAuth Consumer Key</th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
                            value="<%= settings['settingsOAuthConsumerKey'] %>" 
@@ -22,21 +39,22 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     </tr>
 
     <tr>
-      <th>OAuth Consumer Secret</th>
+      <th>Intuit QBO OAuth Consumer Secret</th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
                            value="<%= settings['settingsOAuthConsumerSecret'] %>"
                            name="settings[settingsOAuthConsumerSecret]" >
       </td>
     </tr>
-
-  </tbody>
-</table>
-
-<br/>
-
-<table>
-  <tbody>
+    
+    <tr>
+      <th>Intuit QBO Webhook Token</th>
+      <td>
+        <input type="text" style="width:350px" id="settingsWebhookToken"
+                           value="<%= settings['settingsWebhookToken'] %>"
+                           name="settings[settingsWebhookToken]" >
+      </td>
+    </tr>
 
      <tr>
        <th>Token Expires At</th>
@@ -54,5 +72,36 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 <br/>
 Note: You need to authenticate after saving your key and secret above
 <br/>
- 
-<%= link_to "Authenticate", qbo_authenticate_path, :method => :get  %>
+<br/>
+
+<!-- this will display a button that the user clicks to start the flow -->
+<ipp:connectToIntuit></ipp:connectToIntuit>
+
+<br/>
+<br/>
+
+<div>
+    <b>Customer Count:</b> <%= Customer.count%>
+    </div>
+      
+    <div>
+        <b>Item Count:</b> <%= QboItem.count %>
+    </div>
+      
+    <div>
+        <b>Employee Count:</b> <%= QboEmployee.count %>
+    </div>
+    
+    <div>
+        <b>Invoice Count:</b> <%= QboInvoice.count %>
+    </div>
+    
+    <div>
+        <b>Estimate Count:</b> <%= QboEstimate.count %>
+    </div>
+      
+    <br/>
+    
+    <div>
+        <b>Last Sync: </b> <%= Qbo.last_sync %> <%= link_to " Sync Now", qbo_sync_path %>
+</div>

app/views/qbo/index.html.erb

@@ -12,44 +12,31 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 <body>
     <h1> Redmine Quickbooks</h1>
-    <%= form_for @qbo do |f|%>   
-      <div>
-        <%= f.label "Customer Count:"+@qbo_customer_count.to_s%>
-        <br/>
-        <%= f.select :qbo_customer_id, QboCustomer.all.pluck(:name, :id).sort, :selected => @selected_customer, include_blank: true %>
-      </div>
-      
-      <br/>
-      
-      <div>
-        <%= f.label "Item Count: "+@qbo_item_count.to_s %>
-        <br/>
-        <%= f.select :qbo_item_id, QboItem.all.pluck(:name, :id).sort.reverse, :selected => @selected_item, include_blank: true %>
-      </div>
-      
-      <br/>
-      
-      <div>
-        <%= f.label "Employee Count: "+@qbo_employee_count.to_s %>
-        <br/>
-        <%= f.select :qbo_employee_id, QboEmployee.all.pluck(:name, :id).sort, :selected => @selected_employee, include_blank: true %>
-      </div>
-    
-    
-      <p>
-        <%= f.label "Invoice Count: "+@qbo_invoice_count.to_s %>
-        <br/>
-        <%=f.select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => @selected_invoice, include_blank: true%>
-      </p> 
-      <p>
-        <%= f.label "Estimate Count: "+@qbo_estimate_count.to_s %>
-        <br/>
-        <%=f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => @selected_estimate, include_blank: true%>
-       </p>
     
+    <div>
+        <b>Customer Count:</b> <%= @customer_count.to_s%>
+    </div>
+      
+    <div>
+        <b>Item Count:</b> <%= @qbo_item_count.to_s %>
+    </div>
+      
+    <div>
+        <b>Employee Count:</b> <%= @qbo_employee_count.to_s %>
+    </div>
+    
+    <div>
+        <b>Invoice Count:</b> <%= @qbo_invoice_count.to_s %>
+    </div>
+    
+    <div>
+        <b>Estimate Count:</b> <%= @qbo_estimate_count.to_s %>
+    </div>
       
-    <% end %>    
     <br/>
-    <br/>
-    <%= link_to "Sync", qbo_sync_path %>
+    
+    <div>
+        <b>Last Sync: </b> <%= Qbo.last_sync %>
+    </div>
+    
 </body>

app/views/vehicles/_details.html.erb

@@ -0,0 +1,54 @@
+<table>
+  <tbody>
+  
+    <tr>
+      <th>Customer</th>
+      <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
+    </tr>
+  
+    <tr>
+      <th>Vehicle</th>
+      <td><%= vehicle.to_s %></td>
+    </tr>
+    
+    <tr>
+      <th>VIN</th>
+      <td><%= vehicle.vin %></td>
+    </tr>
+    
+    <tr>
+      <th>Style</th>
+      <td><%= vehicle.style %></td>
+    </tr>
+    
+    <tr>
+      <th>Drive</th>
+      <td><%= vehicle.drive %></td>
+    </tr>
+    
+    <tr>
+      <th>Doors</th>
+      <td><%= vehicle.doors %></td>
+    </tr>
+  
+    <tr>
+      <th>Notes</th>
+      <td><%= vehicle.notes %></td>
+    </tr>
+    
+    <tr>
+        <th>Issues</th>
+        <td><%= vehicle.issues.count %></td>
+    </tr>
+    
+    <tr>
+      <td/>
+      <td>
+      
+        <%= button_to "New Issue", new_issue_path(:vehicle_id => vehicle.id, :customer_id => vehicle.customer.id), method: :get%> 
+        <%= button_to "Edit", edit_vehicle_path(vehicle), method: :get%> 
+        <%= button_to "Delete", vehicle, method: :delete, data: {confirm: "You sure?"} %> 
+      </td>
+    </tr>
+  </tbody>
+</table>

app/views/vehicles/_dropdown.html.erb

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

app/views/vehicles/_form.html.erb

@@ -0,0 +1,62 @@
+<div class="row">
+  <div class="span6 columns">
+    <fieldset>
+
+      <%= form_for @vehicle do |f| %> 
+        <div class="clearfix">
+          Customer: 
+          <div class="input">
+            <%= f.collection_select :customer_id, @customers, :id, :name, include_blank: true, :selected => @customer, :required => true%>
+            </div>
+        </div>
+        
+        <div class="clearfix">
+          Year: 
+          <div class="input">
+            <%= f.number_field :year %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Make:
+          <div class="input">
+            <%= f.text_field :make %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Model:
+          <div class="input">
+            <%= f.text_field :model %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          VIN:
+          <div class="input">
+            <%= f.text_field :vin %>
+          </div>
+        </div>
+        
+        <div class="clearfix">
+          Notes: 
+          <div class="input">
+            <p>
+              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@vehicle.new_record? ? nil : 'display:none') do %>
+                <%= f.text_area :notes,
+                    :cols => 60,
+                    :rows => 10,
+                    :no_label => true %>
+              <% end %>
+            </p>
+          </div>
+        </div>
+        
+       <div class="actions">
+        <%= f.submit %>
+       </div>
+      <% end %>
+
+    </fieldset>
+  </div>
+</div>

app/views/vehicles/_list.html.erb

@@ -0,0 +1,26 @@
+<% if @vehicles.present? %>
+
+  <% @vehicles.each do |vehicle| %>
+    <div class="row">
+      <div>
+        <b><%= link_to "##{vehicle.id}", vehicle_path(vehicle) %> </b>
+      </div>
+      
+      <div>
+        <%= vehicle.to_s %>
+        <br/>
+        <%= vehicle.customer %>
+        <br/>
+        <%= vehicle.vin %>
+      </div>
+    </div>
+    <br/>
+  <% end %>
+
+  <div class="actions">
+    <%= will_paginate @vehicles %>
+  </div>
+
+<% else %>
+  <p>There are no vehicles containing the term(s) <%= params[:search] %>.</p>
+<% end %>

app/views/vehicles/_vehicle.html.erb

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

app/views/vehicles/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Edit Customer Vehicle</h1> 
+<br/> 
+<%= render :partial => 'vehicles/form' %>

app/views/vehicles/index.html.erb

@@ -0,0 +1,9 @@
+<h1>Customer Vehicles</h1> 
+<br/> 
+
+<%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
+  <%= text_field_tag :search, params[:search], placeholder: "Search Vehicles by VIN" %>
+  <%= submit_tag "Search" %>
+<% end %>
+
+<%= render :partial => 'vehicles/list' %>

app/views/vehicles/new.html.erb

@@ -0,0 +1,3 @@
+<h1>New Customer Vehicle</h1> 
+<br/> 
+<%= render :partial => 'vehicles/form' %>

app/views/vehicles/show.html.erb

@@ -0,0 +1,8 @@
+<h1>Vehicle #<%=@vehicle.id%> </h1> 
+<br/> 
+
+<div style="text-align: left; width:90%;">
+  <%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
+
+  <%= render :partial => 'issues/list_simple', locals: {issues: @vehicle.issues} %>
+</div>

app/views/vehicles/update_vehicles.js.erb

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

assets/javascripts/vehicles.js

@@ -0,0 +1,16 @@
+# 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!")

config/initializers/edmunds.rb

@@ -0,0 +1,3 @@
+Edmunds::Api.configure do |config|
+  config.api_key = '2dheutzvhxs28dzukx5tgu47'
+end

config/locales/en.yml

@@ -11,8 +11,11 @@
 # English strings go here for Rails i18n
 en:
   # my_label: "My label"
-  field_qbo_customer: "Customer"
+  field_customer: "Customer"
   field_qbo_item: "Item"
   field_qbo_employee: "Employee"
   field_qbo_invoice: "Invoice"
   field_qbo_estimate: "Estimate" 
+  field_vehicles: "Vehicle"
+  field_vin: "VIN"
+  field_notes: "Notes"

config/routes.rb

@@ -8,12 +8,35 @@
 #
 #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.
 
-# Plugin's routes
-# See: http://guides.rubyonrails.org/routing.html
-#
+# Main Quickbooks landing page
 get 'qbo', :to=> 'qbo#index'
+
+#authentication
 get 'qbo/authenticate', :to => 'qbo#authenticate'
 get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
+
+#manual sync
 get 'qbo/sync', :to => 'qbo#sync'
+
+# Estimate & Invoice PDF
 get 'qbo/estimate/:id', :to => 'estimate#show', as: :estimate
-get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
+get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
+
+#payments
+#get 'qbo/payments', :to => 'payments#new'
+#post 'qbo/payments', :to => 'payments#create'
+resources :payments
+
+#webhook
+post 'qbo/webhook', :to => 'qbo#qbo_webhook'
+
+#ajax
+get "update_vehicles" => 'vehicles#update_vehicles', as: 'update_vehicles'
+
+# Nest Vehicles under customers
+resources :customers do
+  resources :vehicles
+end
+
+#allow for just vehicles too
+resources :vehicles

db/migrate/016_create_vehicles.rb

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

db/migrate/017_update_issues_with_vehicles.rb

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

db/migrate/018_update_vehicles.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 UpdateVehicles < ActiveRecord::Migration
+  def change
+    add_column :vehicles, :name, :text
+  end
+end

db/migrate/019_qbocustomers_to_customers.rb

@@ -0,0 +1,17 @@
+#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 QbocustomersToCustomers< ActiveRecord::Migration
+  def change
+    rename_table :qbo_customers, :customers
+    rename_column :issues, :qbo_customer_id, :customer_id
+    rename_column :vehicles, :qbo_customer_id, :customer_id
+  end 
+end

db/migrate/20_update_qbos_time_stamp.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 UpdateQbosTimeStamp < ActiveRecord::Migration
+  def change
+    add_column :qbos, :last_sync, :datetime 
+  end
+end

init.rb

@@ -19,27 +19,43 @@ Redmine::Plugin.register :redmine_qbo do
    # 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 'pdf_patch'
 
     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.0.4'
+    version '0.3.0'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
 
     # Add safe attributes
-    Issue.safe_attributes 'qbo_customer_id'
+    Issue.safe_attributes 'customer_id'
     Issue.safe_attributes 'qbo_item_id'
     Issue.safe_attributes 'qbo_estimate_id'
     Issue.safe_attributes 'qbo_invoice_id'
+    Issue.safe_attributes 'vehicles_id'
     User.safe_attributes 'qbo_employee_id'
     TimeEntry.safe_attributes 'qbo_billed'
     
     # We are playing in the sandbox 
     #Quickbooks.sandbox_mode = true
+    
+    # set per_page globally
+    WillPaginate.per_page = 10
 
     # Register QBO top menu item
-    menu :top_menu, :qbo, { :controller => 'qbo', :action => 'index' }, :caption => 'Quickbooks'
-
+    #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, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
+    
+    menu :application_menu, :new_customer, { :controller => :customers, :action => :new }, :caption => 'New Customer', :if => Proc.new { User.current.logged? }
+    menu :application_menu, :new_payment, { :controller => :payments, :action => :new }, :caption => 'New Payment', :if => Proc.new { User.current.logged? }
+    
+    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/issue_patch.rb

@@ -13,6 +13,7 @@ require_dependency 'issue'
 # Patches Redmine's Issues dynamically.  
 # Adds a relationships
 module IssuePatch
+
   def self.included(base) # :nodoc:
     base.extend(ClassMethods)
 
@@ -21,11 +22,13 @@ module IssuePatch
     # Same as typing in the class 
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
-      belongs_to :qbo_customer, primary_key: :id
+      belongs_to :customer, primary_key: :id
       belongs_to :qbo_item, primary_key: :id
       belongs_to :qbo_estimate, primary_key: :id
       belongs_to :qbo_invoice, primary_key: :id
+      belongs_to :vehicle, primary_key: :id
     end
+    
   end
     
   module ClassMethods
@@ -39,4 +42,4 @@ module IssuePatch
 end    
 
 # Add module to Issue
-Issue.send(:include, IssuePatch)
+Issue.send(:include, IssuePatch)

lib/issues_form_hook_listener.rb

@@ -9,36 +9,45 @@
 #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 IssuesFormHookListener < Redmine::Hook::ViewListener
-
+  
+  # Load the javascript
+  def view_layouts_base_html_head(context = {})
+    javascript_include_tag 'vehicles', :plugin => 'redmine_qbo'
+  end
+  
   # Edit Issue Form
   # Show a dropdown for quickbooks contacts
   def view_issues_form_details_bottom(context={})
-    # Update the customer and item database
-    #QboCustomer.update_all
-    #QboItem.update_all
-    #QboInvoice.update_all
-    #QboEstimate.update_all
+    f = context[:form]
  
     # Check to see if there is a quickbooks user attached to the issue
-    @selected_customer =  context[:issue].qbo_customer ? context[:issue].qbo_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_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 customers
-    @select_customer = context[:form].select :qbo_customer_id, QboCustomer.all.pluck(:name, :id).sort, :selected => selected_customer, include_blank: true
-  
     # Generate the drop down list of quickbooks items
-    @select_item = context[:form].select :qbo_item_id, QboItem.all.pluck(:name, :id).sort, :selected => selected_item, include_blank: true
+    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 = context[:form].select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_invoice, include_blank: true
+    select_invoice = f.select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_invoice, include_blank: true
     
     # Generate the drop down list of quickbooks extimates
-    @select_estimate = context[:form].select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true
+    select_estimate = f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true
     
-    #@estimates_link = link_to qbo_update_estimates_path
+    if context[:issue].customer
+      vehicles = customer.vehicles.pluck(:name, :id).sort! 
+    else
+      vehicles = Vehicle.all.order(:name).pluck(:name, :id)
+    end
     
-    return "<p>#{@select_customer}</p> <p>#{@select_item}</p> <p>#{@select_invoice}</p> <p>#{@select_estimate} #{@estimates_link}</p>"
+    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>"
   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.qbo_customer && issue.qbo_item
+    if Qbo.first && issue.customer && issue.qbo_item
       
       # 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
@@ -26,7 +26,7 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
           
           # Create the estimate
           estimate  = estimate_base.qr_model(:estimate)
-          estimate.customer_id = issue.qbo_customer_id
+          estimate.customer_id = issue.customer_id
           estimate.txn_date = Date.today
 
           # Create the line item for labor
@@ -55,11 +55,14 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
    # Called After Issue Saved
   def controller_issues_edit_after_save(context={})
     issue = context[:issue]
-    employee_id = issue.assigned_to.qbo_employee_id
+    
+    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.qbo_customer && issue.qbo_item && employee_id && issue.status.is_closed?
+      # 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
@@ -90,7 +93,7 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
       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.qbo_customer_id
+      time_entry.customer_id = issue.customer_id
       time_entry.billable_status = "Billable"
       time_entry.hours = hours
       time_entry.minutes = minutes

lib/issues_show_hook_listener.rb

@@ -21,48 +21,77 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     issue = context[:issue]
 
     # Check to see if there is a quickbooks user attached to the issue
-    @customer =  issue.qbo_customer ? issue.qbo_customer.name : nil
+    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
+    item =  issue.qbo_item ? issue.qbo_item.name : nil
     
-    @estimate = nil
-    @estimate_link = nil
     # Estimate Number
     if issue.qbo_estimate
-      @estimate =  issue.qbo_estimate.doc_number
-      @estimate_link = link_to @estimate, "#{Redmine::Utils::relative_url_root  }/qbo/estimate/#{issue.qbo_estimate.id}", :target => "_blank"
+      estimate =  issue.qbo_estimate.doc_number
+      estimate_link = link_to estimate, "#{Redmine::Utils::relative_url_root}/qbo/estimate/#{issue.qbo_estimate.id}", :target => "_blank"
     end
     
-    @invoice = nil
-    @invo = nil
     # 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 =  issue.qbo_invoice.doc_number
+      invoice_link = link_to invoice, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{issue.qbo_invoice.id}", :target => "_blank"
     end
     
-    return "<div class=\"attributes\">
-              <div class=\"qbo_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>
-            </div>"
+    
+    begin
+      v = Vehicle.find(issue.vehicles_id)
+      vehicle = link_to v.to_s, "#{Redmine::Utils::relative_url_root}/vehicles/#{v.id}"
+      vin = v.vin 
+      notes = v.notes
+    rescue
+      #do nothing
+    end
+    
+    split_vin = vin.scan(/.{1,9}/) if vin
+    
+    return "
+    <div class=\"attributes\">
+    
+      <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>
+      
+      <br/>
+
+      <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_notes attribute\">
+        <div class=\"label\"><span>Notes</span>:</div>
+        <div class=\"value\">#{notes}</div>
+      </div>
+    </div>"
   end
   
 end

lib/pdf_patch.rb

@@ -0,0 +1,247 @@
+require_dependency 'redmine/export/pdf'
+require_dependency 'redmine/export/pdf/issues_pdf_helper'
+
+module IssuesPdfHelperPatch
+
+  def self.included(base)
+    base.send(:include, InstanceMethods)
+    base.class_eval do
+      unloadable # Send unloadable so it will not be unloaded in development
+      alias_method_chain :issue_to_pdf, :patch
+    end
+  end
+
+  module InstanceMethods
+
+    def issue_to_pdf_with_patch(issue, assoc={})
+      pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
+      pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}")
+      pdf.alias_nb_pages
+      pdf.footer_date = format_date(Date.today)
+      pdf.add_page
+      pdf.SetFontStyle('B',11)
+      buf = "#{issue.project} - #{issue.tracker} ##{issue.id}"
+      pdf.RDMMultiCell(190, 5, buf)
+      pdf.SetFontStyle('',8)
+      base_x = pdf.get_x
+      i = 1
+      issue.ancestors.visible.each do |ancestor|
+        pdf.set_x(base_x + i)
+        buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}"
+        pdf.RDMMultiCell(190 - i, 5, buf)
+        i += 1 if i < 35
+      end
+      pdf.SetFontStyle('B',11)
+      pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s)
+      pdf.SetFontStyle('',8)
+      pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
+      pdf.ln
+
+      customer = issue.customer.name if issue.customer
+      left = []
+      left << [l(:field_status), issue.status]
+      left << [l(:field_priority), issue.priority]
+      left << [l(:field_customer), customer]
+      left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
+      #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id')
+      #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
+      
+      v = Vehicle.find_by_id(issue.vehicles_id)
+      vehicle = v ? v.to_s : nil
+      vin = v ? v.vin : nil
+      notes = v ? v.notes : nil
+      left << [l(:field_vehicles), vehicle]
+      left << [l(:field_vin), vin.gsub(/(.{9})/, '\1 ')]
+      #left << [l(:field_notes), notes]
+      
+      right = []
+      right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
+      right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date')
+      right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
+      right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
+      right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
+      right << [l(:field_notes), notes]
+
+      rows = left.size > right.size ? left.size : right.size
+      while left.size < rows
+        left << nil
+      end
+      while right.size < rows
+        right << nil
+      end
+
+      half = (issue.visible_custom_field_values.size / 2.0).ceil
+      issue.visible_custom_field_values.each_with_index do |custom_value, i|
+        (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)]
+      end
+
+      if pdf.get_rtl
+        border_first_top = 'RT'
+        border_last_top  = 'LT'
+        border_first = 'R'
+        border_last  = 'L'
+      else
+        border_first_top = 'LT'
+        border_last_top  = 'RT'
+        border_first = 'L'
+        border_last  = 'R'
+      end
+
+      rows = left.size > right.size ? left.size : right.size
+      rows.times do |i|
+        heights = []
+        pdf.SetFontStyle('B',9)
+        item = left[i]
+        heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+        item = right[i]
+        heights << pdf.get_string_height(35, item ? "#{item.first}:" : "")
+        pdf.SetFontStyle('',9)
+        item = left[i]
+        heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
+        item = right[i]
+        heights << pdf.get_string_height(60, item ? item.last.to_s  : "")
+        height = heights.max
+
+        item = left[i]
+        pdf.SetFontStyle('B',9)
+        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0)
+        pdf.SetFontStyle('',9)
+        pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0)
+
+        item = right[i]
+        pdf.SetFontStyle('B',9)
+        pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "",  (i == 0 ? border_first_top : border_first), '', 0, 0)
+        pdf.SetFontStyle('',9)
+        pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2)
+
+        pdf.set_x(base_x)
+      end
+
+      pdf.SetFontStyle('B',9)
+      pdf.RDMCell(35+155, 5, l(:field_description), "LRT", 1)
+      pdf.SetFontStyle('',9)
+
+      # Set resize image scale
+      pdf.set_image_scale(1.6)
+      text = textilizable(issue, :description,
+                          :only_path => false,
+                          :edit_section_links => false,
+                          :headings => false,
+                          :inline_attachments => false
+      )
+      pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
+
+      unless issue.leaf?
+        truncate_length = (!is_cjk? ? 90 : 65)
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR")
+        pdf.ln
+        issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
+          buf = "#{child.tracker} # #{child.id}: #{child.subject}".
+              truncate(truncate_length)
+          level = 10 if level >= 10
+          pdf.SetFontStyle('',8)
+          pdf.RDMCell(35+135,5, (level >=1 ? "  " * level : "") + buf, border_first)
+          pdf.SetFontStyle('B',8)
+          pdf.RDMCell(20,5, child.status.to_s, border_last)
+          pdf.ln
+        end
+      end
+
+      relations = issue.relations.select { |r| r.other_issue(issue).visible? }
+      unless relations.empty?
+        truncate_length = (!is_cjk? ? 80 : 60)
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR")
+        pdf.ln
+        relations.each do |relation|
+          buf = relation.to_s(issue) {|other|
+            text = ""
+            if Setting.cross_project_issue_relations?
+              text += "#{relation.other_issue(issue).project} - "
+            end
+            text += "#{other.tracker} ##{other.id}: #{other.subject}"
+            text
+          }
+          buf = buf.truncate(truncate_length)
+          pdf.SetFontStyle('', 8)
+          pdf.RDMCell(35+155-60, 5, buf, border_first)
+          pdf.SetFontStyle('B',8)
+          pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "")
+          pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "")
+          pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last)
+          pdf.ln
+        end
+      end
+      pdf.RDMCell(190,5, "", "T")
+      pdf.ln
+
+      if issue.changesets.any? &&
+          User.current.allowed_to?(:view_changesets, issue.project)
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
+        pdf.ln
+        for changeset in issue.changesets
+          pdf.SetFontStyle('B',8)
+          csstr  = "#{l(:label_revision)} #{changeset.format_identifier} - "
+          csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s
+          pdf.RDMCell(190, 5, csstr)
+          pdf.ln
+          unless changeset.comments.blank?
+            pdf.SetFontStyle('',8)
+            pdf.RDMwriteHTMLCell(190,5,'','',
+                                 changeset.comments.to_s, issue.attachments, "")
+          end
+          pdf.ln
+        end
+      end
+
+      if assoc[:journals].present?
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(190,5, l(:label_history), "B")
+        pdf.ln
+        assoc[:journals].each do |journal|
+          pdf.SetFontStyle('B',8)
+          title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}"
+          title << " (#{l(:field_private_notes)})" if journal.private_notes?
+          pdf.RDMCell(190,5, title)
+          pdf.ln
+          pdf.SetFontStyle('I',8)
+          details_to_strings(journal.visible_details, true).each do |string|
+            pdf.RDMMultiCell(190,5, "- " + string)
+          end
+          if journal.notes?
+            pdf.ln unless journal.details.empty?
+            pdf.SetFontStyle('',8)
+            text = textilizable(journal, :notes,
+                                :only_path => false,
+                                :edit_section_links => false,
+                                :headings => false,
+                                :inline_attachments => false
+            )
+            pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
+          end
+          pdf.ln
+        end
+      end
+
+      if issue.attachments.any?
+        pdf.SetFontStyle('B',9)
+        pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
+        pdf.ln
+        for attachment in issue.attachments
+          pdf.SetFontStyle('',8)
+          pdf.RDMCell(80,5, attachment.filename)
+          pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+          pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
+          pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
+          pdf.ln
+        end
+      end
+      pdf.output
+    end
+
+  end
+end
+
+Redmine::Export::PDF::IssuesPdfHelper.send(:include, IssuesPdfHelperPatch)

lib/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 'issue_query'
+
+module QueryPatch
+
+  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
+      alias_method_chain :available_filters, :qbo
+    end
+  end
+      
+  module ClassMethods
+    
+  end
+  
+  module InstanceMethods
+  
+    def available_columns_with_qbo
+      unless @available_columns
+        @available_columns = available_columns_without_qbo
+        @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
+      end
+      @available_columns
+    end
+    
+    def available_filters_with_qbo
+      unless @available_filters
+        @available_filters = available_filters_without_qbo 
+        
+        #qbo_filters = {
+        #  :customer => { 
+        #    :id => l(:field_customer),
+        #    :type => :integer, 
+        #    :order => @available_filters.size + 1},
+        #}
+        
+        qbo_filters = { 
+          "customer_id" => {
+            :id => :customer_id,
+            :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 Issue
+IssueQuery.send(:include, QueryPatch)

lib/users_show_hook_listener.rb

@@ -14,7 +14,7 @@ class UsersShowHookListener < Redmine::Hook::ViewListener
   def view_users_form(context={})
     
     # Update the users
-    QboEmployee.update_all
+    #QboEmployee.update_all
  
     # Check to see if there is a quickbooks user attached to the issue
     @selected = context[:user].qbo_employee.id if context[:user].qbo_employee