Forgot to add sidebar files

Add relationships to projects

Gemfile

@@ -2,9 +2,15 @@ source 'https://rubygems.org'
 
 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'
+gem 'nhtsa_vin'
+gem 'will_paginate'
+gem 'rails-jquery-autocomplete'
+gem 'jquery-rails', '~> 3.1.4'
+gem 'jquery-ui-rails'
+
+group :assets do
+  gem 'coffee-rails'
+end

LICENSE

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

README.md

@@ -1,27 +1,40 @@
-#Redmine Quickbooks Online
+# Redmine Quickbooks Online
 
-A simple plugin for Redmine to connect to Quickbooks Online
+A plugin for Redmine to connect to Quickbooks Online
 
-The goal of this project is to allow redmine to connect with Quickbooks Online to create time activity entries for completed work when an issue is closed.
+The goal of this project is to allow Redmine to connect with Quickbooks Online to create `Time Activity Entries` for completed work when an Issue is closed.
 
-`Note: This project is under heavy development. Currently the initial functionality goal has been meet, however I am still working on adding other features. Tags should be stable`
+`Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable`
 
-####How it works
-* Issues can be assigned to a QBO Customer and QBO Service Item via drop down in issues form
-  - The `QBO Employee` for the issue is assigned via the assigned redmine user
-  - IF an `Issue` has been assined a `QBO Customer`, `QBO Service Item` & `QBO Employee` when an `Issue` is closed the following will happen:
-  - A new `QBO Time Activity` agaist the `QBO Customer` will be created using the total spent hours logged agaist an `Issue`.
-  - The rate will be the set via the `QBO Service Item` price
-* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `QBO Service Item` cost.
-  - Needs to have a `QBO Customer` & `QBO Service Item` Assiged
-* Users will be assigned a `QBO Employee` via a drop down in the user admistration page.
+`Note: I am currently using this in a live production enviroment with no issues`
 
-##Prerequisites
+#### Features
+* Issues can be assigned to a `Customer` via drop down in the edit Issue form
+* The `Employee` for the Issue is assigned via the assigned Redmine User
+  - This is set via a drop down in the user admistration page.
+* IF an `Issue` has been assined a `Customer` when an Issue is closed the following will happen:
+  - A new `Time Activity` will be billed agaist the `Customer` assinged to the issue for each Redmine Time Entery. 
+    + Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
+    + The Time Activity names are used to lookup `Items` in Quickbooks.
+    + IF there isn'tany Items that match the Activity name it will be skipped, and will not be billed to the `Customer` 
+  - Labor Rates are set by the `Item` in Quickbooks
+* `Payments` Can be created via the Redmine application menu
+* `Customers` Can be created via the Redmine application menu
+  - `Customers` can be searched
+  - Basic information for the `Customer` can be viewed/edit via the Customer page
+* Webhook Support
+  - `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
+    + `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
+  - `Customers` are automaticly updated in local database
+
+## Prerequisites
 
 * Sign up to become a developer for Intuit https://developer.intuit.com/
 * Create your own aplication to obtain your API keys
+* Set up webhook service to https://redmine.yourdomain.com/qbo/webhook
+  - See https://developer.intuit.com/docs/0100_accounting/0300_developer_guides/webhooks
 
-##The Install
+## The Install
 
 1. To install, clone this repo into your plugin folder
 
@@ -33,36 +46,38 @@ The goal of this project is to allow redmine to connect with Quickbooks Online t
   
 3. Navigate to the plugin configuration page and suppy your own OAuth key & secret. 
 
-  ![Alt plugin_config](/Screenshots/plugin_config.png)
-
 4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
 
 5. Assign an Employee to each of your users via the User Administration Page
 
-  ![Alt plugin_user_edit](/Screenshots/plugin_user_edit.png)
+## Automatic Deploy
   
+  If you want the redmine server to be automaticly restarted after a git pull event add this hook to your git hook directory
+  https://gist.github.com/rickbarrette/3c999c7f37e321f9c60380de99e494f5
+
 ## Usage
 
-  To enable automatic `QBO Time Activity` entries for an `Issue` , you need only to assign a `QBO Customer` and `QBO Item` to an `Issue` via drop downs in the creation/update form.
-  
-  ![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
+  To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
 
-Note: 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
-  * 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
+  * Customer Deletion
+  * Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue. 
   * Add Setting for Sandbox Mode
+  * Refactor Models prefixed with Qbo...
+  * Seperate Vehicles into a seperate plugin
+  * Make HTML Pretty 
+  * Intergrate Customer Search into Redmine Search
+  * Fix Issue sort by Customer
+  * MORE Stuff...
 
-##License
+## License
 
 The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+Copyright (c) 2017 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

app/controllers/customers_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -13,51 +13,163 @@ class CustomersController < ApplicationController
   unloadable
   
   include AuthHelper
+  helper :issues
+  helper :journals
+  helper :projects
+  helper :custom_fields
+  helper :issue_relations
+  helper :watchers
+  helper :attachments
+  helper :queries
+  include QueriesHelper
+  helper :repositories
+  helper :sort
+  include SortHelper
+  helper :timelog
   
-  before_filter :require_user
+  before_filter :add_customer, :only => :new
+  before_filter :view_customer, :except => :new
+  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:view]
+  
+  default_search_scope :names
+  
+  autocomplete :customer, :name, :full => true, :extra_data => [:id]
+  
+  def filter_vehicles_by_customer
+    @filtered_vehicles = Vehicle.all.where(customer_id: params[:selected_customer])
+  end
+  
+  def filter_invoices_by_customer
+    @filtered_invoices = QboInvoice.all.where(customer_id: params[:selected_customer])
+  end
+  
+  def filter_estimates_by_customer
+    @filtered_estimates = QboEstimate.all.where(customer_id: params[:selected_customer])
+  end
   
   # display a list of all customers
   def index
-    @customers = QboCustomer.paginate(:page => params[:page])
+    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
-    @customer = QboCustomer.find_by_id(params[:id])
-    if @customer
+    begin
+      @customer = Customer.find_by_id(params[:id])
       @vehicles = @customer.vehicles.paginate(:page => params[:page])
-    else
-      flash[:error] = "Customer Not Found"  
-      render :index
+      @issues = @customer.issues
+    rescue ActiveRecord::RecordNotFound
+      render_404
     end
   end
   
   # return an HTML form for editing a customer
   def edit
-    @customer = QboCustomer.find_by_id(params[:id])
+    begin
+      @customer = Customer.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
   end
   
   # update a specific customer
   def update
-    @customer = QboCustomer.find_by_id(params[:id])
-    if @customer.update_attributes(params[:customer])
-      flash[:success] = "Customer updated"
-      redirect_to @customer
-    else
-      render :edit
+    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
+  
+  # Customer view for an issue
+  def view
     
+    User.current = User.find_by lastname: 'Anonymous'
+    
+    @token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
+    @token = @token.first
+    if @token
+      session[:token] = @token.token
+      @issue = Issue.find @token.issue_id
+      @journals = @issue.journals.
+                  preload(:details).
+                  preload(:user => :email_address).
+                  reorder(:created_on, :id).to_a
+      @journals.each_with_index {|j,i| j.indice = i+1}
+      @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+      Journal.preload_journals_details_custom_fields(@journals)
+      @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
+      @journals.reverse! if User.current.wants_comments_in_reverse_order?
+  
+      @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
+      @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+  
+      @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+      @priorities = IssuePriority.active
+      @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+      @relation = IssueRelation.new
+    else
+      render_403
+    end
+  end
+  
+  private
+  
+  def add_customer
+    global_check_permission(:add_customers)
+  end
+  
+  def view_customer
+    global_check_permission(:view_customers)
+  end
+  
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      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

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -18,7 +18,7 @@ class EstimateController < ApplicationController
   # Downloads and forwards the estimate pdf
   #
   def show
-    base = QboEstimate.get_base.service
+    base = QboEstimate.get_base
     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"

app/controllers/invoice_controller.rb

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

app/controllers/line_items_controler.rb

@@ -0,0 +1,96 @@
+#The License
+#
+#Copyright (c) 2018 Rick Barrette - All Rights Reserved
+# 
+#Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
+#
+#Proprietary and confidential
+#
+#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 LineItemsController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_filter :require_user
+  
+  # display all line items for an issue
+  def index
+    if params[:issue_id]
+      begin
+        @line_items = Issue.find_by_id(params[:issue_id]).line_items
+      rescue ActiveRecord::RecordNotFound
+        render_404
+      end
+    end
+  end
+
+  # return an HTML form for creating a new line item
+  def new
+    @line_item = LineItem.new
+  end
+
+  # create a new line item
+  def create
+    @line_item = LineItem.new(params[:line_item])
+    if @line_item.save
+      flash[:notice] = "New Line Item Created"
+      redirect_to @line_item.issue
+    else
+      flash[:error] = @line_item.errors.full_messages.to_sentence 
+      redirect_to new_line_item_path
+    end
+  end
+  
+  # display a specific line item
+  def show
+    begin
+      @line_item = LineItem.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # return an HTML form for editing a line item
+  def edit
+    begin
+      @line_item = LineItem.find_by_id(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+  
+  # update a specific line item
+  def update
+    begin   
+      @line_item = LineItem.find_by_id(params[:id])
+      if @line_item.update_attributes(params[:line_item])
+        flash[:notice] = "Line Item updated"
+        redirect_to @line_item
+      else
+        flash[:error] = @line_item.errors.full_messages.to_sentence if @line_item.errors
+        redirect_to edit_line_item_path
+      end
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end  
+
+  # delete a specific line item
+  def destroy
+    begin
+      line_item = LineItem.find_by_id(params[:id])
+      issue = line_item.issue
+      line_item.destroy
+      flash[:notice] = "Line Item deleted successfully"
+      redirect_to issue
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
+  end
+
+end

app/controllers/payments_controller.rb

@@ -0,0 +1,57 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class PaymentsController < ApplicationController
+  unloadable
+  
+  include AuthHelper
+  
+  before_filter :check_permissions
+  
+  def new
+    @payment = Payment.new
+    
+    @customers = Customer.all.sort_by &:name
+    
+    @accounts = Qbo.get_base(:account).service.query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' Order By Name")
+    
+    @payment_methods = Qbo.get_base(:payment_method).service.all
+  end
+  
+  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 check_permissions
+    if !allowed_to?(:add_payments)
+      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
+    end
+  end
+  
+  def only_one_non_zero?( array )
+    found_non_zero = false
+    array.each do |val|
+      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

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -11,16 +11,19 @@
 class QboController < ApplicationController
   unloadable
   
+  require 'openssl'
+  
   include AuthHelper
   
-  before_filter :require_user
+  before_filter :require_user, :except => :qbo_webhook
+  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
 
   #
   # 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
@@ -31,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
 
@@ -41,42 +44,106 @@ 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" }
     else
       redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
     end
-
+  end
+  
+  # Manual Billing
+  def bill
+    i = Issue.find_by_id params[:id]
+    if i.customer
+      i.bill_time
+      redirect_to i, :flash => { :notice => "Successfully Billed #{i.customer.name}" }
+    else
+      redirect_to i, :flash => { :error => "Cannot bill without a customer assigned" }
+    end
+  end
+  
+  # Quickbooks Webhook Callback
+  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
 
   #
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
-    if Qbo.exists?
-      QboCustomer.update_all
-      QboItem.update_all
-      QboEmployee.update_all
-      QboEstimate.update_all
-      QboInvoice.update_all
-      QboPurchase.update_all
+    # Update info in background
+    Thread.new do
+      if Qbo.exists?
+        Customer.sync
+        QboInvoice.sync
+        QboItem.sync
+        QboEmployee.sync
+        QboEstimate.sync
+        
+        # Record the last sync time
+        Qbo.update_time_stamp
+      end
+      ActiveRecord::Base.connection.close
     end
 
-    redirect_to qbo_path(:redmine_qbo), :flash => { :notice => "Successfully synced to Quickbooks" }
+    redirect_to :back, :flash => { :notice => "Successfully synced to Quickbooks" }
   end
 end

app/controllers/vehicles_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -18,59 +18,99 @@ class VehiclesController < ApplicationController
   
   # display a list of all vehicles
   def index
-    @vehicles = Vehicle.paginate(:page => params[:page])
+    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
+    @customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
   end
 
   # create a new vehicle
   def create
     @vehicle = Vehicle.new(params[:vehicle])
-    @vehicle.save!
-    redirect_to @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
-    @vehicle = Vehicle.find_by_id(params[:id])
-    if @vehicle
-      @customer = @vehicle.qbo_customer.name if @vehicle.qbo_customer
-    else
-      flash[:error] = "Vehicle Not Found"  
-      render :index
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+      @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
+    rescue ActiveRecord::RecordNotFound
+      render_404
     end
   end
   
   # return an HTML form for editing a vehicle
   def edit
-    @vehicle = Vehicle.find_by_id(params[:id])
-    @customer = @vehicle.qbo_customer.id if @vehicle.qbo_customer
+    begin
+      @vehicle = Vehicle.find_by_id(params[:id])
+      @customer = @vehicle.customer
+    rescue ActiveRecord::RecordNotFound
+      render_404
+    end
   end
   
   # update a specific vehicle
   def update
-    @vehicle = Vehicle.find_by_id(params[:id])
-    if @vehicle.update_attributes(params[:vehicle])
-      flash[:success] = "Vehicle updated"
-      redirect_to @vehicle
-    else
-      render :edit
+    @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 
-    v = Vehicle.find_by_id(params[:id])
-    if v != nil
-      v.destroy
-      flash.now[:notice] = "Vehicle deleted successfully"
-    else
-      flash.now[:error] = "No Vehicle Found"
+  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
-    redirect_to action: :index
+  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

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

app/helpers/estimate_helper.rb

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

app/helpers/invoice_helper.rb

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

app/models/customer.rb

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

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

app/models/line_item.rb

@@ -0,0 +1,34 @@
+#Copyright (c) 2018 Rick Barrette - All Rights Reserved
+# 
+#Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
+#
+#Proprietary and confidential
+#
+#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 LineItem < ActiveRecord::Base
+  
+  unloadable
+  
+  belongs_to :issue
+  
+  attr_accessible :amount, :description, :unit_price, :quantity, :item_id
+  validates_presence_of :amount, :description, :unit_price, :quantity
+  
+  def add_to_invoice(invoice)
+    line_item = Quickbooks::Model::InvoiceLineItem.new
+    line_item.amount = amount
+    line_item.description = description
+    line_item.sales_item! do |detail|
+      detail.unit_price = unit_price
+      detail.quantity = quantity
+      detail.item_id = item_id # Item ID here... Where do i get this???
+    end
+    
+    invoice.line_items << line_item
+    
+    return invoice
+  end
+end

app/models/payment.rb

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

app/models/qbo.rb

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

@@ -1,128 +0,0 @@
-#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 QboCustomer < ActiveRecord::Base
-  unloadable
-  
-  has_many :issues
-  has_many :qbo_purchases
-  has_many :vehicles
-  
-  attr_accessible :name
-  validates_presence_of :id, :name
-  
-  after_initialize :get_details
-  
-  self.primary_key = :id
-  
-  # returns true if the customer is active
-  def active?
-    return @details.active? if @details
-  end
-  
-  # returns a human readable string
-  def to_s
-    return name
-  end
-  
-  # returns the customer's email
-  def email
-    begin 
-      return @details.email_address.address
-    rescue
-      return nil
-    end
-  end
-  
-  # returns the customer's primary phone
-  def primary_phone
-    begin 
-      return @details.primary_phone.free_form_number
-    rescue
-      return nil
-    end
-  end
-  
-  # returns the customer's mobile phone
-  def mobile_phone
-    begin
-      return @details.mobile_phone.free_form_number
-    rescue
-      return nil
-    end
-  end
-  
-  # returns the customer's notes
-  def notes
-    return @details.notes if @details
-  end
-  
-  # updates the customer's notes in QBO
-  def notes=(s)
-    customer = get_customer(self.id)
-    customer.notes = s
-    get_base.update(customer)
-  end
-  
-  # returns the bases QBO service for customers
-  def get_base
-    Qbo.get_base(:customer)
-  end
-  
-  # returns the QBO customer 
-  def get_customer (id)
-    get_base.find_by_id(id)
-  end
-
-  # proforms a bruteforce sync operation
-  # This needs to be simplified
-  def 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)
-        # only update if diffrent
-        if not qbo_customer.name == customer.display_name
-          qbo_customer.name = customer.display_name
-          qbo_customer.id = customer.id
-          qbo_customer.save!
-        end
-      }
-    end
-   
-    # remove deleted customers
-    where.not(customers.map(&:id)).destroy_all
-  end
-  
-  private
-  
-  # init details
-  def get_details
-    if self.id
-      @details = get_customer(self.id)
-      update
-    end
-  end
-  
-  # update's the customers name if updated
-  def update
-    begin
-      if not self.name == @detils.display_name
-        self.name = @details.display_name
-        self.save
-      end
-    rescue
-      return nil
-    end
-  end
-  
-end

app/models/qbo_employee.rb

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

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

app/models/qbo_invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,37 +10,146 @@
 
 class QboInvoice < ActiveRecord::Base
   unloadable
-  has_many :issues
-  attr_accessible :doc_number
-  validates_presence_of :id, :doc_number
+  
+  has_and_belongs_to_many :issues
+  belongs_to :customer 
+  attr_accessible :doc_number, :id
+  validates_presence_of :doc_number, :id
+  self.primary_key = :id
   
   def self.get_base
-    Qbo.get_base(:invoice)
+    Qbo.get_base(:invoice).service
   end
   
-  def self.update_all
-    #Pull the invoices from the quickbooks server
-    invoices = get_base.service.all
+  # sync ALL the invoices
+  def self.sync
+    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.all 
+    else
+      invoices = get_base.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 
-    
-    #remove deleted invoices 
-    where.not(invoices.map(&:id)).destroy_all
+    invoices.each { | invoice | 
+      process_invoice invoice
+    }
   end
   
-  def self.update(id)
-    # Update the item table
-    invoice = get_base.service.fetch_by_id(id)
-      qbo_invoice = find_or_create_by(id: id)
-      qbo_invoice.doc_number = invoice.doc_number
-      qbo_invoice.save!
+  #sync by invoice ID
+  def self.sync_by_id(id)
+    #update the information in the database
+    invoice = get_base.fetch_by_id(id) 
+    process_invoice invoice
   end
+  
+  private
+  
+   # Attach the invoice to the issue
+  def self.attach_to_issue(issue, invoice)
+    return if issue.nil?
+    
+    # skip this issue if the issue customer is not the same as the invoice customer
+    return if issue.customer_id != invoice.customer_ref.value.to_i
+    
+    # Load the invoice into the database
+    qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
+    qbo_invoice.doc_number = invoice.doc_number 
+    qbo_invoice.id = invoice.id
+    qbo_invoice.customer_id = invoice.customer_ref
+    qbo_invoice.save!
+    
+    unless issue.qbo_invoices.include?(qbo_invoice)
+      issue.qbo_invoices << qbo_invoice
+      issue.save!
+    end
+    
+    compare_custom_fields(issue, invoice)
+  end
+  
+  # processes the invoice into the system
+  def self.process_invoice(invoice)
+    # Check the private notes 
+    if not invoice.private_note.nil?
+      invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
+        attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+      }
+    end
+    
+    # Scan the line items for hashtags and attach to the applicable issues
+    invoice.line_items.each { |line|
+      if line.description
+        line.description.scan(/#(\w+)/).flatten.each { |issue|
+          attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
+        }
+      end
+    }
+  end
+  
+  def self.compare_custom_fields(issue, invoice)
+    is_changed = false
+    
+    # update the invoive custom fields with infomation from the work ticket if available
+    invoice.custom_fields.each { |cf|
+    
+      # TODO Add some hooks here
+      
+      # VIN from the attached vehicle
+      begin
+        if cf.name.eql? "VIN"
+          vin = Vehicle.find(issue.vehicles_id).vin
+          break if vin.nil?
+          if not cf.string_value.to_s.eql? vin
+            cf.string_value = vin.to_s
+            is_changed = true
+          end
+        end
+      rescue
+        #do nothing
+      end
+      
+      # Custom Values
+      begin
+        value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
+        
+        # Check to see if the value is blank...
+        if not value.value.to_s.blank?
+          # Check to see if the value is diffrent
+          if not cf.string_value.to_s.eql? value.value.to_s
+            
+            # Use the lowest Milage
+            if cf.name.eql? "Mileage In"
+              if cf.string_value.to_i > value.value.to_i or cf.string_value.blank?
+                cf.string_value = value.value.to_s
+                is_changed = true
+              end
+            # Use the max milage
+            elsif  cf.name.eql? "Mileage Out"
+              if cf.string_value.to_i < value.value.to_i or cf.string_value.blank?
+                cf.string_value = value.value.to_s
+                is_changed = true
+              end
+            else
+              # Everything else
+              cf.string_value = value.value.to_s
+              is_changed = true
+            end
+          end
+        end
+      rescue
+        # Nothing to do here, there is no match
+      end
+    }
+    
+    # TODO Add some hooks here
+
+    # Push updates
+    #invoice.sync_token += 1 if is_changed
+    get_base.update(invoice) if is_changed
+  end
+    
 end

app/models/qbo_item.rb

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

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

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -11,17 +11,27 @@
 class Vehicle < ActiveRecord::Base
   
   unloadable
-  belongs_to :qbo_customer
   
-  attr_accessible :year, :make, :model, :qbo_customer_id, :notes, :vin
-  validates_presence_of :year, :make, :model, :qbo_customer_id
+  belongs_to :customer
+  has_many :issues, :foreign_key => 'vehicles_id'
   
-  before_validation :decode_vin
+  attr_accessible :year, :make, :model, :customer_id, :notes, :vin
+  
+  validates_presence_of :customer
+  validates :vin, uniqueness: true
+  before_save :decode_vin
   after_initialize :get_details
   
+  self.primary_key = :id
+  
   # returns a human readable string
   def to_s
-    return "#{self.year} #{self.make} #{self.model}"
+    if year.nil? or make.nil? or model.nil?
+      return "#{vin}"
+    else
+      split_vin = vin.scan(/.{1,9}/)
+      return "#{year} #{make} #{model} - #{split_vin[1]}"
+    end
   end
   
   # returns the raw JSON details from EMUNDS
@@ -32,7 +42,7 @@ class Vehicle < ActiveRecord::Base
   # returns the style of the vehicle
   def style
     begin
-      return @details['years'][0]['styles'][0]['name'] if @details
+      return @details.trim if @details
     rescue
       return nil
     end
@@ -40,49 +50,68 @@ class Vehicle < ActiveRecord::Base
   
   # returns the drive of the vehicle i.e. 2 wheel, 4 wheel, ect.
   def drive
-    return @details['drivenWheels'] if @details
+    #todo fix this
+    #return @details.drive_type if @details
+    return nil
   end
   
   # returns the number of doors of the vehicle
   def doors
-    return @details['numOfDoors'] if @details
+    return @details.doors if @details
   end
   
-  private
+  # 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)
+    #strip VIN of all illegal chars (for barcode scanner)
+    val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
+    write_attribute(:vin, val)
+  end
+  
+  # search for a vin
+  def self.search(search)
+    where("vin LIKE ?", "%#{search}%")
+  end
+  
+private
   
   # init method to pull JSON details from Edmunds
   def get_details
     if self.vin?
-      @details = JSON.parse get_decoder.full(self.vin)
+      begin
+        query = NhtsaVin.get(self.vin)
+        raise RuntimeError, query.error  unless query.valid?
+        @details = query.response
+      rescue Exception => e
+        errors.add(:vin, e.message)
+      end
     end
   end
   
-  # returns the Edmunds decoder service
-  def get_decoder
-    #TODO API Code via Settings
-    return decoder = Edmunds::Vin.new('2dheutzvhxs28dzukx5tgu47')
-  end
-  
   # decodes a vin and updates self
   def decode_vin
     get_details
-    if self.vin?
-      details
-      self.year = @details['years'][0]['year']
-      self.make = @details['make']['name']
-      self.model = @details['model']['name']
+    if @details
+      begin
+        self.year = @details.year unless @details.year.nil?
+	self.make = @details.make unless @details.make.nil?
+	self.model = @details.model unless @details.model.nil?
+      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

@@ -1,34 +1,53 @@
 <table>
   <tbody>
-    <tr>
-      <th>Customer</th>
-      <td><%= @customer.name %></td>
-    </tr>
-    
     <tr>
       <th>Email</th>
-      <td><%= @customer.email %></td>
+      <td><%= customer.email %></td>
     </tr>
     
     <tr>
       <th>Primary Phone</th>
-      <td><%= @customer.primary_phone %></td>
+      <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><%= @customer.mobile_phone %></td>
+      <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>
+      <td><%= customer.notes %></td>
     </tr>
     
-        <tr>
-      <td/>
+    <tr>
       <td>
-        <%= button_to "Edit", edit_customer_path(@customer), method: :get%> 
+        <%= button_to "Edit Customer", edit_customer_path(customer), method: :get%> 
       </td>
     </tr>
   </tbody>

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

@@ -0,0 +1,6 @@
+<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
+<%= text_field_tag :search, params[:search], placeholder: "Search Customers" %>
+<%= submit_tag "Search" %>
+<% end %>
+<%= button_to "New Customer", new_customer_path, method: :get%>
+<%= button_to "Sync", qbo_sync_path, method: :get%>

app/views/customers/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<h3>Customers</h3>
+<%= render :partial => 'customers/search' %>

app/views/customers/edit.html.erb

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

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/filter_vehicles_by_customer.js.erb

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

app/views/customers/index.html.erb

@@ -1,20 +1,24 @@
-<h1>Customers</h1> 
-<br/> 
-<% @customers.each do |c| %>
-  <div class="row">
-    <div class="span6 columns">
-      <fieldset>
-        <% @customer = c %>
-        <%= render :partial => 'customers/details' %>
-        <%= button_to "Show", customer_path(c.id), method: :get %>
-      </fieldset>
+<h2>Customers <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<% if @customers.present? %>
+  <br/>
+  <% @customers.each do |c| %>
+    <div class="row">
+      <div class="span6 columns">
+        <%= link_to c, customer_path(c.id) %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
 
-<br/>
+<p>Matching <%= @customers.count %> Customers </p>
 
 <div class="actions">
   <%= will_paginate @customers %>
-  <%= button_to "New", new_customer_path, method: :get %>       
+</div>
+
+<% else %>
+  <p>There are no customers containing the term(s) <%= params[:search] %>.</p>
+<% end %>
+
+<div>
+  <%= render :partial => 'qbo/stats' %>
 </div>

app/views/customers/new.html.erb

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

app/views/customers/show.html.erb

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

app/views/customers/view.html.erb

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

app/views/issues/_list_simple.html.erb

@@ -0,0 +1,29 @@
+<% if issues && issues.any? %>
+<%= form_tag({}) do %>
+  <table class="list issues">
+    <thead><tr>
+    <th>#</th>
+    <th><%=l(:field_project)%></th>
+    <th><%=l(:field_tracker)%></th>
+    <th><%=l(:field_subject)%></th>
+    </tr></thead>
+    <tbody>
+    <% for issue in issues %>
+    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+      <td class="id">
+        <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
+        <%= link_to(issue.id, issue_path(issue)) %>
+      </td>
+      <td class="project"><%= link_to_project(issue.project) %></td>
+      <td class="tracker"><%= issue.tracker %></td>
+      <td class="subject">
+        <%= link_to(issue.subject.truncate(60), issue_path(issue)) %> (<%= issue.status %>)
+      </td>
+    </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% end %>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>

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

@@ -0,0 +1 @@
+<b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>

app/views/qbo/_settings.html.erb

@@ -10,10 +10,19 @@ 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>Intuit QBO OAuth Consumer Key</th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
                            value="<%= settings['settingsOAuthConsumerKey'] %>" 
@@ -22,21 +31,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 +64,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 if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
+</div>

app/views/qbo/_stats.html.erb

@@ -0,0 +1 @@
+<%= Customer.count %> Customers - <%= render :partial => 'qbo/last_sync' %>

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 if Qbo.exists? %>
+    </div>
+    
 </body>

app/views/vehicles/_details.html.erb

@@ -1,45 +1,42 @@
 <table>
   <tbody>
+  
     <tr>
       <th>Customer</th>
-      <td><%= @customer %></td>
+      <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
     </tr>
-    
+  
     <tr>
       <th>Vehicle</th>
-      <td><%= @vehicle.to_s %></td>
+      <td><%= vehicle.to_s %></td>
     </tr>
     
     <tr>
       <th>VIN</th>
-      <td><%= @vehicle.vin %></td>
+      <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
     </tr>
     
     <tr>
       <th>Style</th>
-      <td><%= @vehicle.style %></td>
+      <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>
+      <td><%= vehicle.notes %></td>
+    </tr>
+    
+    <tr>
+        <th>Issues</th>
+        <td><%= vehicle.issues.count %></td>
     </tr>
     
     <tr>
       <td/>
       <td>
-        <%= button_to "Edit", edit_vehicle_path(@vehicle), method: :get%> 
-        <%= button_to "Delete", @vehicle, method: :delete, data: {confirm: "You sure?"} %> 
+      
+        <%= button_to "Edit", edit_vehicle_path(vehicle), method: :get%> 
+        <%= button_to "Delete", vehicle, method: :delete, data: {confirm: "You sure?"} %> 
       </td>
     </tr>
   </tbody>

app/views/vehicles/_dropdown.html.erb

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

app/views/vehicles/_form.html.erb

@@ -4,44 +4,45 @@
 
       <%= form_for @vehicle do |f| %> 
         <div class="clearfix">
-          Customer: 
-          <div class="input">
-            <%= f.collection_select :qbo_customer_id, QboCustomer.order(:name), :id, :name, include_blank: true, :selected => @customer, :required => true%>
+		Customer:
+	  <div class="input">
+		  <%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
+		  <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
             </div>
         </div>
         
         <div class="clearfix">
           Year: 
           <div class="input">
-            <%= f.text_field :year, :required => true %>
+            <%= f.number_field :year %>
           </div>
         </div>
         
         <div class="clearfix">
           Make:
           <div class="input">
-            <%= f.text_field :make, :required => true %>
+            <%= f.text_field :make %>
           </div>
         </div>
         
         <div class="clearfix">
           Model:
           <div class="input">
-            <%= f.text_field :model, :required => true %>
+            <%= f.text_field :model %>
           </div>
         </div>
         
         <div class="clearfix">
           VIN:
           <div class="input">
-            <%= f.text_field :vin %>
+            <%= f.text_field :vin , :autofocus => true %>
           </div>
         </div>
         
         <div class="clearfix">
           Notes: 
           <div class="input">
-            <%= f.text_area :notes, :rows => 6, :class => 'wiki-edit', :accesskey => accesskey(:edit), :cols => 60%>
+            <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
           </div>
         </div>
         

app/views/vehicles/_list.html.erb

@@ -1,18 +1,28 @@
-<% @vehicles.each do |vehicle| %>
-  <div class="row">
-    <div class="span6 columns">
-      <fieldset>
-        <% @customer = vehicle.qbo_customer.name if vehicle.qbo_customer %>
-        <% @vehicle = vehicle %>
-        <%= render :partial => 'vehicles/details' %>
-      </fieldset>
+<% 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>
+
+<p>Matching <%= @vehicles.count %> Vehicles </p>
+
+<% else %>
+  <p>There are no vehicles containing the term(s) <%= params[:search] %>.</p>
 <% end %>
-
-<br/>
-
-<div class="actions">
-  <%= will_paginate @vehicles %>
-  <%= button_to "New", new_vehicle_path, method: :get %>       
-</div>

app/views/vehicles/_search.html.erb

@@ -0,0 +1,4 @@
+<%= 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 %>

app/views/vehicles/_vehicle.html.erb

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

app/views/vehicles/index.html.erb

@@ -1,3 +1,4 @@
-<h1>Customer Vehicles</h1> 
+<h2>Customer Vehicles <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2> 
 <br/> 
+
 <%= render :partial => 'vehicles/list' %>

app/views/vehicles/new.html.erb

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

app/views/vehicles/show.html.erb

@@ -1,3 +1,8 @@
-<h1>Customer Vehicle</h1> 
+<h2>Vehicle #<%=@vehicle.id%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
 <br/> 
-<%= render :partial => 'vehicles/details' %>
+
+<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/workers/email_worker.rb

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

assets/javascripts/application.js

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

assets/javascripts/autocomplete-rails.js

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

config/initializers/edmunds.rb

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

config/locales/en.yml

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -11,11 +11,14 @@
 # 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_vehicle: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
+  field_qbo_billed: "Billed"
+  label_week: "Week"

config/routes.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -8,14 +8,42 @@
 #
 #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
+
+#manual billing
+get 'qbo/bill/:id', :to => 'qbo#bill', as: :bill
+
+#customer issue view
+get 'customers/view/:token', :to => 'customers#view', as: :view
+
+#payments
+resources :payments
+
+#webhook
+post 'qbo/webhook', :to => 'qbo#qbo_webhook'
+
+#java script routes
+get 'filter_vehicles_by_customer' => 'customers#filter_vehicles_by_customer'
+get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
+get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
+
+# Nest Vehicles under customers
+resources :customers do
+  resources :vehicles
+  get :autocomplete_customer_name, :on => :collection
+end
+
+#allow for just vehicles too
 resources :vehicles
-resources :customers

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/020_update_qbos_time_stamp.rb

@@ -8,6 +8,8 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module VehicleHelper
-
+class UpdateQbosTimeStamp < ActiveRecord::Migration
+  def change
+    add_column :qbos, :last_sync, :datetime 
+  end
 end

db/migrate/021_add_issues_qbo_invoices.rb

@@ -0,0 +1,27 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2016 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AddIssuesQboInvoices < ActiveRecord::Migration
+  def self.up
+    create_table :issues_qbo_invoices, :id => false do |t|
+      t.references :issue
+      t.references :qbo_invoice
+    end
+    
+    add_index :issues_qbo_invoices, [:issue_id, :qbo_invoice_id], :unique => true
+    
+    # Now populate it with a SQL one-liner!
+    execute "insert into issues_qbo_invoices(issue_id, qbo_invoice_id) select id, qbo_invoice_id from issues"
+  end
+
+  def self.down
+    drop_table :issues_qbo_invoices
+  end
+end

db/migrate/022_update_issues_remove_invoice.rb

@@ -8,11 +8,8 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module 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 
-
+class UpdateIssuesRemoveInvoice < ActiveRecord::Migration
+  def change
+    remove_reference :issues, :qbo_invoice
+  end
 end

db/migrate/023_create_customer_tokens.rb

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

db/migrate/024_update_invoices_and_estimates.rb

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

db/migrate/025_update_projects.rb

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

db/migrate/026_create_line_items.rb

@@ -0,0 +1,26 @@
+#The License
+#
+#Copyright (c) 2018 Rick Barrette - All Rights Reserved
+# 
+#Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
+#
+#Proprietary and confidential
+#
+#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 CreateLineItems < ActiveRecord::Migration
+  def change  
+    create_table :line_items do |t| 
+      t.integer  :item_id
+      t.float    :amount
+      t.string   :description 
+      t.float    :unit_price 
+      t.float    :quantity
+      t.boolean  :billed
+    end
+    
+    add_reference :line_items, :issues, index: true
+  end
+end

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -15,38 +15,52 @@ Redmine::Plugin.register :redmine_qbo do
    require_dependency 'issues_save_hook_listener'
    require_dependency 'issues_show_hook_listener'
    require_dependency 'users_show_hook_listener'
-   
+   require_dependency 'header_footer_hook_listener'
+   require_dependency 'projects_form_hook_listener'
+   require_dependency 'view_hook_listener'
+
    # Patches to the Redmine core.  Will not work in development mode
     require_dependency 'issue_patch'
+    require_dependency 'project_patch'
     require_dependency 'user_patch'
     require_dependency 'query_patch'
+    require_dependency 'time_entry_query_patch'
     require_dependency 'pdf_patch'
+    require_dependency 'attachments_controller_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.5'
+    version '0.7.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'
-    
+    Project.safe_attributes 'customer_id'
+    Project.safe_attributes 'vehicle_id'
+
     # We are playing in the sandbox 
     #Quickbooks.sandbox_mode = true
-    
-    # set per_page globally
-    WillPaginate.per_page = 10
 
+    # set per_page globally
+    WillPaginate.per_page = 20
+  
+    permission :view_customers, :customers => :index, :public => false
+    permission :add_customers, :customers => :new, :public => false
+    permission :view_payments, :payments => :index, :public => false
+    permission :add_payments, :payments => :new, :public => false
+    permission :view_vehicles, :payments => :new, :public => false
+  
     # Register QBO top menu item
-    menu :top_menu, :qbo, { :controller => :qbo, :action => :index }, :caption => 'Quickbooks', :if => Proc.new { User.current.admin? }
+    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
     menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
-    menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new { User.current.logged? }
+    
 end

lib/attachments_controller_patch.rb

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

lib/header_footer_hook_listener.rb

@@ -0,0 +1,19 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class HeaderFooterHookListener < Redmine::Hook::ViewListener
+
+  def view_layouts_base_html_head(context = {})
+    #nothing
+  end
+
+  def view_layouts_base_body_bottom(context = {})
+    return "<div id='qbo_footer' align='center'><b>Last Sync: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
+  end
+end

lib/issue_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -22,10 +22,12 @@ 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 :qbo_item, primary_key: :id
+      belongs_to :customer, primary_key: :id
+      belongs_to :customer_token, primary_key: :id
       belongs_to :qbo_estimate, primary_key: :id
-      belongs_to :qbo_invoice, primary_key: :id
+      has_and_belongs_to_many :qbo_invoices
+        #, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
+  
       belongs_to :vehicle, primary_key: :id
     end
     
@@ -36,7 +38,64 @@ module IssuePatch
   end
   
   module InstanceMethods
+    
+    # Create billable time entries
+    def bill_time
+     
+      return if assigned_to.nil?
+
+      # Get unbilled time entries
+      spent_time = time_entries.where(qbo_billed: [false, nil])
+      spent_hours ||= spent_time.sum(:hours) || 0
+      
+      if spent_hours > 0 then
+      
+        # Prepare to create a new Time Activity
+        time_service = Qbo.get_base(:time_activity).service
+        item_service = Qbo.get_base(:item).service
+        time_entry = Quickbooks::Model::TimeActivity.new
   
+        h = Hash.new(0)
+        spent_time.each do |entry|
+          # Lets tottal up each activity
+          h[entry.activity.name] += entry.hours
+          # update time entries billed status
+          entry.qbo_billed = true
+          entry.save
+        end
+        
+        h.each do |key, val|
+          
+          # Convert float spent time to hours and minutes
+          hours = val.to_i
+          minutesDecimal = (( val - hours) * 60)
+          minutes = minutesDecimal.to_i
+          
+          item = item_service.query("SELECT * FROM Item WHERE Name = '#{key}' ").first
+          next if item.nil?
+          
+          time_entry.description = "#{tracker} ##{id}: #{subject} #{"(Partial @ #{done_ratio}%)" if not closed?}"
+          # TODO entry.user.qbo_employee.id
+          time_entry.employee_id = assigned_to.qbo_employee_id 
+          time_entry.customer_id = customer_id
+          time_entry.billable_status = "Billable"
+          time_entry.hours = hours
+          time_entry.minutes = minutes
+          time_entry.name_of = "Employee"
+          time_entry.txn_date = Date.today
+          time_entry.hourly_rate = item.unit_price
+          time_entry.item_id = item.id 
+          time_entry.start_time = start_date
+          time_entry.end_time = Time.now
+          time_service.create(time_entry)
+        end
+      end
+    end
+  end
+  
+  # Create a shareable link for a customer
+  def share_token
+    CustomerToken.create(:expires_at => Time.now + 1.month, :issue_id => id)
   end
   
 end    

lib/issues_form_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -10,39 +10,49 @@
 
 class IssuesFormHookListener < Redmine::Hook::ViewListener
   
+  # Load the javascript
+  def view_layouts_base_html_head(context = {})
+    js = javascript_include_tag 'application', :plugin => 'redmine_qbo'
+    js += javascript_include_tag 'autocomplete-rails', :plugin => 'redmine_qbo'
+    return js
+  end
+  
   # Edit Issue Form
   # Show a dropdown for quickbooks contacts
   def view_issues_form_details_bottom(context={})
     f = context[:form]
+    
+    #check project level customer/vehicle ownership first
+    selected_customer = context[:project].customer ? context[:project].customer.id : nil
+    selected_vehicle = context[:project].vehicle ? context[:project].vehicle.id : nil
  
     # 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_customer =  context[:issue].customer ? context[:issue].customer.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
     
-    customer = QboCustomer.find_by_id(selected_customer) if selected_customer
-    vehicle = context[:issue].vehicles_id
+    # Load customer information
+    customer = Customer.find_by_id(selected_customer) if selected_customer   
+    search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#issue_customer_id', :value => '#issue_customer'}
+    customer_id = f.hidden_field :customer_id, :id => "issue_customer_id"
     
-    # Generate the drop down list of quickbooks customers
-    select_customer = f.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 = f.select :qbo_item_id, QboItem.all.pluck(:name, :id).sort, :selected => selected_item, include_blank: true
+    if context[:issue].customer
+      if customer.vehicles
+        vehicles = customer.vehicles.pluck(:name, :id)
+      else
+        vehicles = [nil].compact
+      end
+      estimates = customer.qbo_estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
+    else
+      vehicles = [nil].compact
+      estimates = [nil].compact
+    end
     
-    # Generate the drop down list of quickbooks invoices
-    select_invoice = f.select :qbo_invoice_id, QboInvoice.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_invoice, include_blank: true
+     # Generate the drop down list of quickbooks extimates
+    select_estimate = f.select :qbo_estimate_id, estimates, :selected => selected_estimate, include_blank: true
     
-    # Generate the drop down list of quickbooks extimates
-    select_estimate = f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true
+    vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
     
-    #@estimates_link = link_to qbo_update_estimates_path
-    
-    #render_on :view_issues_form_details_bottom, :partial => 'hooks/redmine_qbo/vehicles/dropdown'
-    vehicles = customer.vehicles.pluck(:name, :id).sort if customer
-    vehicles = Vehicle.all if not vehicles
-    vehicle = f.select :vehicles_id, vehicles, include_blank: true, :selected => vehicle
-    
-    return "<p>#{select_customer}</p> <p>#{select_item}</p> <p>#{select_invoice}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
+    return "<p><label for=\"issue_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
   end
 end

lib/issues_save_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -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_id
       
       # if this is a quote, lets create a new estimate based off estimated hours
         if issue.tracker.name = "Quote" && issue.status.name = "New" && issue.qbo_estimate
@@ -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
@@ -44,10 +44,6 @@ class IssuesSaveHookListener < Redmine::Hook::ViewListener
 
           # Add the line items to the estimate
           estimate.line_items << line_item
-
-          # Save the etimate to the issue
-          #issue.qbo_estimate_id = estimate_base.service.create(estimate).id
-          #issue.save!
         end
       end
   end
@@ -55,52 +51,6 @@ 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
-
-    # 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?
-  end
-    
-  # Create billable time entries
-  def bill_time(issue, employee_id)
-  
-    # Get unbilled time entries
-    spent_time = issue.time_entries.where(qbo_billed: [false, nil])
-    spent_hours ||= spent_time.sum(:hours) || 0
-    
-    if spent_hours > 0 then
-    
-      # Prepare to create a new Time Activity
-      time_service = Qbo.get_base(:time_activity).service
-      item_service = Qbo.get_base(:item).service
-      time_entry = Quickbooks::Model::TimeActivity.new
-    
-      # Convert float spent time to hours and minutes
-      hours  = spent_hours.to_i
-      minutesDecimal = (( spent_hours - hours) * 60)
-      minutes = minutesDecimal.to_i
-      
-      # update time entries billed status
-      spent_time.each do |entry|
-        entry.qbo_billed = true
-        entry.save
-      end
-    
-      item = item_service.fetch_by_id issue.qbo_item_id
-      time_entry.description = "#{issue.tracker} ##{issue.id}: #{issue.subject}"
-      time_entry.employee_id = employee_id
-      time_entry.customer_id = issue.qbo_customer_id
-      time_entry.billable_status = "Billable"
-      time_entry.hours = hours
-      time_entry.minutes = minutes
-      time_entry.name_of = "Employee"
-      time_entry.txn_date = Date.today
-      time_entry.hourly_rate = item.unit_price
-      time_entry.item_id = issue.qbo_item_id 
-      time_entry.start_time = issue.start_date
-      time_entry.end_time = Time.now
-      time_service.create(time_entry)
-    end
+    issue.bill_time if Qbo.first && issue.customer && issue.status.is_closed?
   end
 end

lib/issues_show_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -19,12 +19,11 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
   # Display the quickbooks contact in the issue
   def view_issues_show_details_bottom(context={})
     issue = context[:issue]
-
-    # Check to see if there is a quickbooks user attached to the issue
-    customer =  issue.qbo_customer ? issue.qbo_customer.name : nil
     
-    # Check to see if there is a quickbooks item attached to the issue
-    item =  issue.qbo_item ? issue.qbo_item.name : nil
+    # Check to see if there is a quickbooks user attached to the issue
+    if issue.customer
+      customer =  link_to issue.customer.name, "#{Redmine::Utils::relative_url_root}/customers/#{issue.customer.id}"
+    end
     
     # Estimate Number
     if issue.qbo_estimate
@@ -33,59 +32,68 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
     end
     
     # Invoice Number
-    if issue.qbo_invoice
-      invoice =  issue.qbo_invoice.doc_number
-      invoice_link = link_to invoice, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{issue.qbo_invoice.id}", :target => "_blank"
+    invoice_link = ""
+    if issue.qbo_invoice_ids
+      issue.qbo_invoice_ids.each do |i|
+        invoice = QboInvoice.find i
+        invoice_link = invoice_link + link_to( invoice.doc_number, "#{Redmine::Utils::relative_url_root}/qbo/invoice/#{i}", :target => "_blank").to_s + " "
+      end
     end
     
-    
-    if issue.vehicles_id
-      v = Vehicle.find_by_id(issue.vehicles_id)
+    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=\"splitcontent\">
     
-      <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 class=\"splitcontentleft\">
+        <div class=\"customer_id attribute\">
+          <div class=\"label\"><span>Customer</span>:</div>
+          <div class=\"value\">#{customer}</div>
+        </div>
+  
+        <div class=\"qbo_estimate_id attribute\">
+          <div class=\"label\"><span>Estimate</span>:</div>
+          <div class=\"value\">#{estimate_link}</div>
+        </div>
+          
+        <div class=\"qbo_invoice_id attribute\">
+          <div class=\"label\"><span>Invoice</span>:</div>
+          <div class=\"value\">#{invoice_link}</div>
+        </div>
       </div>
       
-      <br/>
-
-      <div class=\"vehicle attribute\">
-        <div class=\"label\"><span>Vehicle</span>:</div>
-        <div class=\"value\">#{vehicle}</div>
-      </div>
+      <div class=\"splitcontentleft\">
+        <div class=\"vehicle attribute\">
+          <div class=\"label\"><span>Vehicle</span>:</div>
+          <div class=\"value\">#{vehicle}</div>
+        </div>
+          
+        <div class=\"vehicle_vin attribute\">
+          <div class=\"label\"><span>VIN</span>:</div>
+          <div class=\"value\">#{split_vin[0] if split_vin}<b>#{split_vin[1] if split_vin}</b></div>
+        </div>
         
-      <div class=\"vehicle_vin attribute\">
-        <div class=\"label\"><span>VIN</span>:</div>
-        <div class=\"value\">#{vin}</div>
-      </div>
-      
-      <div class=\"vehicle_notes attribute\">
-        <div class=\"label\"><span>Notes</span>:</div>
-        <div class=\"value\">#{notes}</div>
+        <div class=\"vehicle_notes attribute\">
+          <div class=\"label\"><span>Notes</span>:</div>
+          <div class=\"value\">#{notes}</div>
+        </div>
       </div>
     </div>"
   end
   
+  def view_issues_show_description_bottom(context={})
+    bill_button = button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get if User.current.admin?
+    share_button = button_to "Share", "#{Redmine::Utils::relative_url_root}/customers/view/#{context[:issue].share_token.token}", method: :get if User.current.logged?
+    return "<br/> #{bill_button} #{share_button}"
+  end
+  
 end

lib/pdf_patch.rb

@@ -37,10 +37,11 @@ module IssuesPdfHelperPatch
       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_qbo_customer), issue.qbo_customer.name]
+      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')
@@ -50,8 +51,8 @@ module IssuesPdfHelperPatch
       vin = v ? v.vin : nil
       notes = v ? v.notes : nil
       left << [l(:field_vehicles), vehicle]
-      left << [l(:field_vin), vin]
-      left << [l(:field_notes), notes]
+      left << [l(:field_vin), vin ? vin.gsub(/(.{9})/, '\1 ') : nil]
+      #left << [l(:field_notes), notes]
       
       right = []
       right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
@@ -59,7 +60,7 @@ module IssuesPdfHelperPatch
       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]
+      right << [l(:field_notes), notes]
 
       rows = left.size > right.size ? left.size : right.size
       while left.size < rows

lib/project_patch.rb

@@ -0,0 +1,40 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_dependency 'project'
+
+# Patches Redmine's Projects dynamically.  
+# Adds a relationships
+module ProjectPatch
+
+  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
+    belongs_to :customer, primary_key: :id
+    belongs_to :vehicle, primary_key: :id
+  end
+  end
+end
+    
+module ClassMethods
+    
+end
+  
+module InstanceMethods
+ 
+end
+  
+# Add module to Project
+Project.send(:include, ProjectPatch)

lib/projects_form_hook_listener.rb

@@ -0,0 +1,36 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2017 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class ProjectsFormHookListener < Redmine::Hook::ViewListener
+  
+  # Edit Project Form
+  def view_projects_form(context={})
+    f = context[:form]
+ 
+    # Check to see if there is a quickbooks user attached to the issue
+    selected_customer =  context[:project].customer ? context[:project].customer  : nil
+    selected_vehicle = context[:project].vehicle_id ? context[:project].vehicle_id : nil
+    
+    # Load customer information
+    customer = Customer.find_by_id(selected_customer) if selected_customer   
+    search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#project_customer_id', :value => '#project_customer'}
+    customer_id = f.hidden_field :customer_id, :id => "project_customer_id"
+    
+    if context[:project].customer
+      vehicles = customer.vehicles.pluck(:name, :id).sort!
+    else
+      vehicles = [nil].compact
+    end
+    
+    vehicle = f.select :vehicle_id, vehicles, :selected => selected_vehicle, include_blank: true
+    
+    return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{vehicle}</p>"
+end
+end

lib/query_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2017 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -35,7 +35,8 @@ module QueryPatch
     def available_columns_with_qbo
       unless @available_columns
         @available_columns = available_columns_without_qbo
-        @available_columns << QueryColumn.new(:qbo_customer, :sortable => "#{QboCustomer.table_name}.name", :groupable => true, :caption => :field_qbo_customer)
+        @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
+        @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
       end
       @available_columns
     end
@@ -44,14 +45,23 @@ module QueryPatch
       unless @available_filters
         @available_filters = available_filters_without_qbo 
         
-        qbo_filters = {
-          "customer" => { 
-            :name => l(:field_qbo_customer),
-            :type => :text, 
-            :order => @available_filters.size + 1},
-        }
+        #qbo_filters = {
+        #  :customer => { 
+        #    :id => l(:field_customer),
+        #    :type => :integer, 
+        #    :order => @available_filters.size + 1},
+        #}
         
-        @available_filters.merge!(qbo_filters)
+        #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

lib/time_entry_query_patch.rb

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

lib/user_patch.rb

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

lib/users_show_hook_listener.rb

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

lib/view_hook_listener.rb

@@ -0,0 +1,3 @@
+class ViewHookListener < Redmine::Hook::ViewListener
+  render_on :view_issues_sidebar_issues_bottom, :partial => "customers/sidebar"
+end

test/unit/customer_token_test.rb

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