Moved strings to Ruby I18n en.yml

titleize all subjects

Gemfile

@@ -1,14 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'quickbooks-ruby'
-gem 'quickbooks-ruby-base'
-gem 'oauth-plugin'
 gem 'oauth2'
 gem 'roxml'
 gem 'nhtsa_vin'
 gem 'will_paginate'
 gem 'rails-jquery-autocomplete'
 gem 'jquery-ui-rails'
+gem 'faraday_middleware', '1.2.0'
 
 group :assets do
   gem 'coffee-rails'

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Rick Barrette
+Copyright (c) 2022 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

@@ -6,8 +6,6 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
 
 #### Disclaimer
 
-OAuth2 is hacked into place with version 0.8.0 & working but I'm sure I missed a few things
-
 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
 
 Also worth metioning I am currently using this in a live production enviroment with no issues

app/controllers/customers_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,7 +11,7 @@
 # This controller class will handle map management
 class CustomersController < ApplicationController
   unloadable
-  
+
   include AuthHelper
   helper :issues
   helper :journals
@@ -26,27 +26,37 @@ class CustomersController < ApplicationController
   helper :sort
   include SortHelper
   helper :timelog
-  
+
-  before_filter :add_customer, :only => :new
+  before_action  :add_customer, :only => :new
-  before_filter :view_customer, :except => :new
+  before_action  :view_customer, :except => :new
-  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:view]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
-  
+
   default_search_scope :names
-  
+
   autocomplete :customer, :name, :full => true, :extra_data => [:id]
-  
+
+  def allowed_params
+    params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number)
+  end
+
+  # getter method for a customer's vehicles
+  # used for customer autocomplete field / issue form
   def filter_vehicles_by_customer
     @filtered_vehicles = Vehicle.all.where(customer_id: params[:selected_customer])
   end
-  
+
+  # getter method for a customer's invoices
+  # used for customer autocomplete field / issue form
   def filter_invoices_by_customer
     @filtered_invoices = QboInvoice.all.where(customer_id: params[:selected_customer])
   end
-  
+
+  # getter method for a customer's estimates
+  # used for customer autocomplete field / issue form
   def filter_estimates_by_customer
     @filtered_estimates = QboEstimate.all.where(customer_id: params[:selected_customer])
   end
-  
+
   # display a list of all customers
   def index
     if params[:search]
@@ -56,22 +66,24 @@ class CustomersController < ApplicationController
       end
     end
   end
-  
+
+  # initialize a new customer
   def new
     @customer = Customer.new
   end
-  
+
+  # create a new customer
   def create
-    @customer = Customer.new(params[:customer])
+    @customer = Customer.new(allowed_params)
     if @customer.save
       flash[:notice] = "New Customer Created"
       redirect_to @customer
     else
-      flash[:error] = @customer.errors.full_messages.to_sentence 
+      flash[:error] = @customer.errors.full_messages.to_sentence
       redirect_to new_customer_path
     end
   end
-  
+
   # display a specific customer
   def show
     begin
@@ -82,7 +94,7 @@ class CustomersController < ApplicationController
       render_404
     end
   end
-  
+
   # return an HTML form for editing a customer
   def edit
     begin
@@ -91,12 +103,12 @@ class CustomersController < ApplicationController
       render_404
     end
   end
-  
+
   # update a specific customer
   def update
     begin
       @customer = Customer.find_by_id(params[:id])
-      if @customer.update_attributes(params[:customer])
+      if @customer.update_attributes(allowed_params)
         flash[:notice] = "Customer updated"
         redirect_to @customer
       else
@@ -107,7 +119,8 @@ class CustomersController < ApplicationController
       render_404
     end
   end
-  
+
+  # delete a customer
   def destroy
     begin
       Customer.find_by_id(params[:id]).destroy
@@ -117,12 +130,12 @@ class CustomersController < ApplicationController
       render_404
     end
   end
-  
+
-  # Customer view for an issue
+  # displays an issue for a customer with a provided security CustomerToken
   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
@@ -137,10 +150,10 @@ class CustomersController < ApplicationController
       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
@@ -150,17 +163,21 @@ class CustomersController < ApplicationController
       render_403
     end
   end
-  
+
   private
-  
+
+  # redmine permission - add customers
   def add_customer
     global_check_permission(:add_customers)
   end
-  
+
+  # redmine permission - view customers
   def view_customer
     global_check_permission(:view_customers)
   end
-  
+
+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
   def only_one_non_zero?( array )
     found_non_zero = false
     array.each do |val|

app/controllers/estimate_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,16 +12,34 @@ class EstimateController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user
+  before_action :require_user
   
   #
   # Downloads and forwards the estimate pdf
   #
   def show
-    base = QboEstimate.get_base
+    e = QboEstimate.find_by_id(params[:id]) if params[:id]
-    estimate = base.fetch_by_id(params[:id])
+    e = QboEstimate.find_by_doc_number(params[:search]) if params[:search]
-    @pdf = base.pdf(estimate)
+
-    send_data @pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    begin
+      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
+  end
+
+  #
+  # Downloads estimate by document number
+  #
+  def doc
+    e = QboEstimate.find_by_doc_number(params[:id]) if params[:id]
+    e = QboEstimate.find_by_doc_number(params[:search]) if params[:search]
+    
+    begin
+      send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+    rescue
+      redirect_to :back, :flash => { :error => "Estimate not found" }
+    end
   end
 
 end

app/controllers/invoice_controller.rb

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

app/controllers/line_items_controler.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2018 rick barrette
+#Copyright (c) 2022 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 LineItemsController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user
+  before_action :require_user
   
   # display all line items for an issue
   def index

app/controllers/payments_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,7 +12,7 @@ class PaymentsController < ApplicationController
   
   include AuthHelper
   
-  before_filter :check_permissions
+  before_action :check_permissions
   
   def new
     @payment = Payment.new

app/controllers/qbo_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,8 +15,8 @@ class QboController < ApplicationController
   
   include AuthHelper
   
-  before_filter :require_user, :except => :qbo_webhook
+  before_action :require_user, :except => :qbo_webhook
-  skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
+  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
 
   #
   # Called when the QBO Top Menu us shown
@@ -35,7 +35,7 @@ class QboController < ApplicationController
   #
   def authenticate
     oauth2_client = Qbo.get_client
-    callback = "https://redmine.rickbarrette.org/qbo/oauth_callback/" 
+    callback = Setting.host_name + "/qbo/oauth_callback/" 
     #callback = qbo_oauth_callback_url
     grant_url = oauth2_client.auth_code.authorize_url(redirect_uri: callback, response_type: "code", state: SecureRandom.hex(12), scope: "com.intuit.quickbooks.accounting")
     redirect_to grant_url
@@ -49,22 +49,17 @@ class QboController < ApplicationController
       oauth2_client = Qbo.get_client
       # use the state value to retrieve from your backend any information you need to identify the customer in your system
       #redirect_uri = qbo_oauth_callback_url
-      redirect_uri = "https://redmine.rickbarrette.org/qbo/oauth_callback/"
+      redirect_uri = Setting.host_name + "/qbo/oauth_callback/"
       if resp = oauth2_client.auth_code.get_token(params[:code], redirect_uri: redirect_uri)
-        # save your tokens here. For example:
-        # quickbooks_credentials.update_attributes(access_token: resp.token, refresh_token: resp.refresh_token, 
-        #    realm_id: params[:realmId])
         
+        # Remove the last authentication information
         Qbo.delete_all
         
         # Save the authentication information 
         qbo = Qbo.new
-        qbo.qb_token = resp.token
-        qbo.qb_secret = resp.refresh_token
-        qbo.token_expires_at = 6.months.from_now.utc 
-        qbo.reconnect_token_at = 3.months.from_now.utc 
         qbo.company_id = params[:realmId]
         
+        # Generate Access Token & Serialize it into the database
         access_token = OAuth2::AccessToken.new(oauth2_client, resp.token, refresh_token: resp.refresh_token)
         qbo.token = access_token.to_hash
         qbo.expire = 1.hour.from_now.utc
@@ -92,6 +87,8 @@ class QboController < ApplicationController
   
   # Quickbooks Webhook Callback
   def qbo_webhook
+
+    logger.debug "Quickbooks is calling webhook"
     
     # check the payload
     signature = request.headers['intuit-signature']
@@ -115,10 +112,12 @@ class QboController < ApplicationController
         
         # TODO rename all other models!
         name.prepend("Qbo") if not name.eql? "Customer"
-        
+       
+        logger.debug "Casting #{name.constantize} to obj"
+
         # Magicly initialize the correct class
         obj = name.constantize
-        
+
         # for merge events
         obj.destroy(entity['deletedId']) if entity['deletedId']
         
@@ -127,7 +126,13 @@ class QboController < ApplicationController
             obj.destroy(id)
         #if not then update!
         else
-          obj.sync_by_id(id)
+          begin
+            obj.sync_by_id(id)
+          rescue => e
+            logger.error "Failed to call sync_by_id on obj"
+            logger.error e.message
+            logger.error e.backtrace.join("\n")
+          end
         end
       end
       
@@ -139,12 +144,15 @@ class QboController < ApplicationController
     else
       render nothing: true, status: 400
     end
+
+    logger.debug "Quickbooks webhook complete"
   end
 
   #
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
+    logger.debug "Syncing EVERYTHING"
     # Update info in background
     Thread.new do
       if Qbo.exists?

app/controllers/vehicles_controller.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,15 @@
 # This controller class will handle map management
 class VehiclesController < ApplicationController
   unloadable
-  
+
   include AuthHelper
-  
+
-  before_filter :require_user
+  before_action :require_user
-  
+
+  def allowed_params
+    params.require(:vehicle).permit(:year, :make, :model, :customer_id, :notes, :vin)
+  end
+
   # display a list of all vehicles
   def index
     if params[:customer_id]
@@ -25,7 +29,8 @@ class VehiclesController < ApplicationController
         render_404
       end
     end
-    
+
+    # search for a vehicle by vin
     if params[:search]
       @vehicles = Vehicle.search(params[:search]).paginate(:page => params[:page])
       if only_one_non_zero?(@vehicles)
@@ -42,16 +47,16 @@ class VehiclesController < ApplicationController
 
   # create a new vehicle
   def create
-    @vehicle = Vehicle.new(params[:vehicle])
+    @vehicle = Vehicle.new(allowed_params)
     if @vehicle.save
       flash[:notice] = "New Vehicle Created"
       redirect_to @vehicle
     else
-      flash[:error] = @vehicle.errors.full_messages.to_sentence 
+      flash[:error] = @vehicle.errors.full_messages.to_sentence
       redirect_to Vehicle.find_by_vin @vehicle.vin
     end
   end
-  
+
   # display a specific vehicle
   def show
     begin
@@ -61,7 +66,7 @@ class VehiclesController < ApplicationController
       render_404
     end
   end
-  
+
   # return an HTML form for editing a vehicle
   def edit
     begin
@@ -71,13 +76,13 @@ class VehiclesController < ApplicationController
       render_404
     end
   end
-  
+
   # update a specific vehicle
   def update
     @customer = params[:customer]
-    begin   
+    begin
       @vehicle = Vehicle.find_by_id(params[:id])
-      if @vehicle.update_attributes(params[:vehicle])
+      if @vehicle.update_attributes(allowed_params)
         flash[:notice] = "Vehicle updated"
         redirect_to @vehicle
       else
@@ -88,7 +93,7 @@ class VehiclesController < ApplicationController
     rescue ActiveRecord::RecordNotFound
       render_404
     end
-  end  
+  end
 
   # delete a specific vehicle
   def destroy
@@ -100,9 +105,11 @@ class VehiclesController < ApplicationController
       render_404
     end
   end
-  
+
   private
-  
+
+  # checks to see if there is only one item  in an array
+  # @return true if array only has one item
   def only_one_non_zero?( array )
     found_non_zero = false
     array.each do |val|
@@ -114,4 +121,4 @@ class VehiclesController < ApplicationController
     found_non_zero
   end
 
-end
+end

app/models/customer.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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:
 #
@@ -17,7 +17,7 @@ class Customer < ActiveRecord::Base
   has_many :qbo_estimates
   has_many :vehicles
   
-  attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone, :phone_number
+  #attr_accessible :name, :notes, :email, :primary_phone, :mobile_phone, :phone_number
   validates_presence_of :id, :name
   
   self.primary_key = :id

app/models/customer_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,7 +11,7 @@
 class CustomerToken < ActiveRecord::Base
   unloadable
   has_many :issues
-  attr_accessible :token, :expires_at, :issue_id
+  #attr_accessible :token, :expires_at, :issue_id
   validates_presence_of :expires_at, :issue_id
   before_create :generate_token
 

app/models/line_item.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2018 rick barrette
+#Copyright (c) 2022 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 LineItem < ActiveRecord::Base
   
   belongs_to :issue
   
-  attr_accessible :amount, :description, :unit_price, :quantity, :item_id
+  #attr_accessible :amount, :description, :unit_price, :quantity, :item_id
   validates_presence_of :amount, :description, :unit_price, :quantity
   
   def add_to_invoice(invoice)

app/models/qbo.rb

@@ -10,28 +10,38 @@
 
 class Qbo < ActiveRecord::Base
   unloadable
-  validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
+  #validates_presence_of :qb_token, :qb_secret, :company_id, :token_expires_at, :reconnect_token_at
+  validates_presence_of :token, :company_id, :expire
   serialize :token
 
   OAUTH_CONSUMER_KEY = Setting.plugin_redmine_qbo['settingsOAuthConsumerKey']
   OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
   
+  #
+  # Getter for quickbooks OAuth2 client
+  #
   def self.get_client
     oauth_params = {
-    site: "https://appcenter.intuit.com/connect/oauth2",
+     site: "https://appcenter.intuit.com/connect/oauth2",
-    authorize_url: "https://appcenter.intuit.com/connect/oauth2",
+     authorize_url: "https://appcenter.intuit.com/connect/oauth2",
-    token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
+     token_url: "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer"
-  }
+    }
     return OAuth2::Client.new(OAUTH_CONSUMER_KEY, OAUTH_CONSUMER_SECRET, oauth_params)
   end
-     
+  
+
+  #
+  # Getter for oauth consumer
+  #
   def self.get_oauth_consumer
     # Quickbooks Config Info
     return $qb_oauth_consumer
   end
 
+  # 
   # Get a quickbooks base service object for type
   # @params type of base
+  #
   def self.get_base(type)
     # lets getnourbold access token from the database
     oauth2_client = get_client

app/models/qbo_employee.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +11,7 @@
 class QboEmployee < ActiveRecord::Base
   unloadable
   has_many :users
-  attr_accessible :name
+  #attr_accessible :name
   validates_presence_of :id, :name
   
   def self.get_base

app/models/qbo_estimate.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +13,7 @@ class QboEstimate < ActiveRecord::Base
   
   has_and_belongs_to_many :issues
   belongs_to :customer 
-  attr_accessible :doc_number, :id
+  #attr_accessible :doc_number, :id
   validates_presence_of :doc_number, :id
   self.primary_key = :id
   
@@ -55,4 +55,12 @@ class QboEstimate < ActiveRecord::Base
     qbo_estimate.id = estimate.id
     qbo_estimate.save!
   end
+
+  # download the pdf from quickbooks
+  def pdf
+    base = QboEstimate.get_base
+    estimate = base.fetch_by_id(id)
+    return base.pdf(estimate)
+  end
+  
 end

app/models/qbo_invoice.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +13,7 @@ class QboInvoice < ActiveRecord::Base
   
   has_and_belongs_to_many :issues
   belongs_to :customer 
-  attr_accessible :doc_number, :id
+  #attr_accessible :doc_number, :id
   validates_presence_of :doc_number, :id
   self.primary_key = :id
   
@@ -23,6 +23,7 @@ class QboInvoice < ActiveRecord::Base
   
   # sync ALL the invoices
   def self.sync
+    logger.debug "Syncing all invoices"
     last = Qbo.first.last_sync
     
     query = "SELECT Id, DocNumber FROM Invoice"
@@ -42,6 +43,7 @@ class QboInvoice < ActiveRecord::Base
   
   #sync by invoice ID
   def self.sync_by_id(id)
+    logger.debug "Syncing invoice #{id}"
     #update the information in the database
     invoice = get_base.fetch_by_id(id) 
     process_invoice invoice
@@ -56,6 +58,8 @@ class QboInvoice < ActiveRecord::Base
     # 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
     
+    logger.debug "Attaching invoice #{invoice.id} to issue #{issue.id}"
+
     # Load the invoice into the database
     qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
     qbo_invoice.doc_number = invoice.doc_number 
@@ -73,6 +77,7 @@ class QboInvoice < ActiveRecord::Base
   
   # processes the invoice into the system
   def self.process_invoice(invoice)
+    logger.debug "Processing invoice"
     # Check the private notes 
     if not invoice.private_note.nil?
       invoice.private_note.scan(/#(\w+)/).flatten.each { |issue|
@@ -105,6 +110,7 @@ class QboInvoice < ActiveRecord::Base
           break if vin.nil?
           if not cf.string_value.to_s.eql? vin
             cf.string_value = vin.to_s
+            logger.debug "VIN has changed"
             is_changed = true
           end
         end
@@ -149,7 +155,14 @@ class QboInvoice < ActiveRecord::Base
 
     # Push updates
     #invoice.sync_token += 1 if is_changed
-    get_base.update(invoice) if is_changed
+    begin
+      logger.debug "Trying to update invoice"
+      get_base.update(invoice) if is_changed
+    rescue
+      # Do nothing, probaly too many vehicles on the invoice. This is a problem with how it's billed
+      # TODO Add notes in memo area
+      logger.error "Failed to update invoice"
+    end
   end
     
 end

app/models/qbo_item.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +11,7 @@
 class QboItem < ActiveRecord::Base
   unloadable
   has_many :issues
-  attr_accessible :name
+  #attr_accessible :name
   validates_presence_of :id, :name
 
   self.primary_key = :id

app/models/qbo_purchase.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 rick barrette
 #
 #Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 #
@@ -12,7 +12,7 @@ class QboPurchase < ActiveRecord::Base
   unloadable
   belongs_to :issues
   belongs_to :qbo_customer
-  attr_accessible :description
+  #attr_accessible :description
   validates_presence_of :id, :line_id, :description, :qbo_customer_id
   
   def self.get_base

app/models/vehicle.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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 Vehicle < ActiveRecord::Base
   belongs_to :customer
   has_many :issues, :foreign_key => 'vehicles_id'
   
-  attr_accessible :year, :make, :model, :customer_id, :notes, :vin
+  #attr_accessible :year, :make, :model, :customer_id, :notes, :vin
   
   validates_presence_of :customer
   validates :vin, uniqueness: true

app/views/customers/_details.html.erb

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

app/views/customers/_form.html.erb

@@ -5,35 +5,35 @@
       <%= form_for @customer do |f| %> 
        
         <div class="clearfix">
-          Display Name: 
+          <%=t(:label_display_name)%> 
           <div class="input">
             <%= f.text_field :name, :required => true %>
           </div>
         </div>
         
         <div class="clearfix">
-          Phone Number:
+          <%=t(:label_primary_phone)%>
           <div class="input">
             <%= f.telephone_field :primary_phone %>
           </div>
         </div>
         
        <div class="clearfix">
-          Mobile Phone Number:
+          <%=t(:label_mobile_phone)%>:
           <div class="input">
             <%= f.telephone_field :mobile_phone %>
           </div>
         </div>
         
         <div class="clearfix">
-          Email:
+          <%=t(:label_email)%>:
           <div class="input">
             <%= f.email_field :email %>
           </div>
         </div>
         
         <div class="clearfix">
-          Notes: 
+          <%=t(:field_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? %>

app/views/customers/_search.html.erb

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

app/views/customers/_sidebar.html.erb

@@ -1,2 +1,2 @@
-<h3>Customers</h3>
+<h3><%=t(:label_customers)%></h3>
 <%= render :partial => 'customers/search' %>

app/views/customers/edit.html.erb

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

app/views/customers/index.html.erb

@@ -1,4 +1,4 @@
-<h2>Customers <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<h2><%=t(:field_customers)%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
 <% if @customers.present? %>
   <br/>
   <% @customers.each do |c| %>
@@ -9,14 +9,14 @@
     </div>
   <% end %>
 
-<p>Matching <%= @customers.count %> Customers </p>
+<p><%=t(:label_matching)%> <%= @customers.count %> <%=t(:field_customers)%> </p>
 
 <div class="actions">
   <%= will_paginate @customers %>
 </div>
 
 <% else %>
-  <p>There are no customers containing the term(s) <%= params[:search] %>.</p>
+  <p><%=t(:label_no_customers)%> <%= params[:search] %>.</p>
 <% end %>
 
 <div>

app/views/customers/new.html.erb

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

app/views/customers/show.html.erb

@@ -1,24 +1,28 @@
-<h2>Customer #<%= @customer.id %> - <%= @customer.name %> </h2> 
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2>
-  <br/> 
+  <br/>
-  
+
   <div class="subject">
-    <div><h3>Details:</h3></div>
+    <div><h3><%=t(:label_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>
+        <h4><%=t(:field_vehicles)%>:</h4>
         <%= render :partial => 'vehicles/list' %>
         <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
       </div>
     </div>
-    
+
     <br/>
-    <h2>Issues:</h2>
+    <h2><%=t(:label_open_issues)%>:</h2>
-    <%= render :partial => 'issues/list_simple', locals: {issues: @issues} %>
+    <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+
+    <h2><%=t(:label_closed_issues)%>:</h2>
+    <%= render :partial => 'issues/list_simple', locals: {issues: (@issues - @issues.open)} %>
+
   </div>

app/views/customers/view.html.erb

@@ -6,7 +6,7 @@
 
 <div class="subject">
 <%=  render_issue_subject_with_tree(@issue)  %>
-This customer link expires in <%= distance_of_time_in_words(Time.now, @token.expires_at) %>
+<%=t(:label_customer_link_expires)%> <%= distance_of_time_in_words(Time.now, @token.expires_at) %>
 </div>
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.

app/views/estimates/_search.html.erb

@@ -0,0 +1,4 @@
+<%= form_tag("/qbo/estimate/doc", :method => "get", id: "est-search-form") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates) %>
+    <%= submit_tag t(:label_search), :formtarget => "_blank" %>
+<% end %>

app/views/estimates/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<h3><%=t(:label_estimates) %></h3>
+<%= render :partial => 'estimates/search' %>

app/views/payments/_form.html.erb

@@ -5,28 +5,28 @@
       <%= form_for @payment do |f| %> 
        
         <div class="clearfix">
-          Customer: 
+          <%=t(:field_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: 
+          <%=t(:label_deposit_into)%>: 
           <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: 
+          <%=t(:label_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: 
+          <%=t(:label_amount)%>: 
           <div class="input">
             <%= f.number_field :total_amount %>
           </div>

app/views/payments/new.html.erb

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

app/views/public/401.html.erb

@@ -1 +1 @@
-<%= flash.now[:error] = "Not Authorized" %>
+<%= flash.now[:error] = t(:label_401) %>

app/views/qbo/_issues_show_details.html.erb

@@ -1,34 +1,34 @@
 <div class="splitcontent"> 
   <div class="splitcontentleft">
     <div class="customer_id attribute">
-      <div class="label"><span>Customer</span>:</div>
+      <div class="label"><span><%=t(:field_customer)%></span>:</div>
       <div class="value"><%= customer %></div>
     </div>
   
     <div class="qbo_estimate_id attribute">
-      <div class="label"><span>Estimate</span>:</div>
+      <div class="label"><span><%=t(:field_qbo_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="label"><span><%=t(:field_qbo_invoice)%></span>:</div>
       <div class="value"><%= invoice_link %></div>
     </div>
    </div>
       
   <div class="splitcontentleft">
     <div class="vehicle attribute">
-      <div class="label"><span>Vehicle</span>:</div>
+      <div class="label"><span><%=t(:field_vehicle)%></span>:</div>
       <div class="value"><%= vehicle %></div>
     </div>
        
     <div class="vehicle_vin attribute">
-      <div class="label"><span>VIN</span>:</div>
+      <div class="label"><span><%=t(:field_vin)%></span>:</div>
       <div class="value"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div>
     </div>
        
     <div class="vehicle_notes attribute">
-      <div class="label"><span>Notes</span>:</div>
+      <div class="label"><span><%=t(:field_notes)%></span>:</div>
       <div class="value"><%=notes%></div>
     </div>
   </div>

app/views/qbo/_last_sync.html.erb

@@ -1 +1 @@
-<b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
+<b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>

app/views/qbo/_settings.html.erb

@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+Copyright (c) 2020 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,14 +15,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 <!-- 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 %>'});
+intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= Setting.host_name %>/qbo/authenticate'});
 </script>
 
 <table >
   <tbody>
   
     <tr>
-      <th>Intuit QBO OAuth Consumer Key</th>
+      <th><%=t(:label_client_id)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
                            value="<%= settings['settingsOAuthConsumerKey'] %>" 
@@ -31,7 +31,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
     <tr>
-      <th>Intuit QBO OAuth Consumer Secret</th>
+      <th><%=t(:label_client_secret)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
                            value="<%= settings['settingsOAuthConsumerSecret'] %>"
@@ -40,7 +40,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
     
     <tr>
-      <th>Intuit QBO Webhook Token</th>
+      <th><%=t(:label_webhook_token)%></th>
       <td>
         <input type="text" style="width:350px" id="settingsWebhookToken"
                            value="<%= settings['settingsWebhookToken'] %>"
@@ -49,20 +49,15 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
      <tr>
-       <th>Token Expires At</th>
+       <th><%=t(:label_oauth_expires)%></th>
-       <td><%= if Qbo.exists? then Qbo.first.token_expires_at end %>
+       <td><%= if Qbo.exists? then Qbo.first.expire end %>
-     </tr>
-
-     <tr>
-       <th>Reconnect Token At</th>
-       <td><%= if Qbo.exists? then Qbo.first.reconnect_token_at end  %>
      </tr>
 
   </tbody>
 </table>
 
 <br/>
-Note: You need to authenticate after saving your key and secret above
+<%=t(:label_oauth_note)%>
 <br/>
 <br/>
 
@@ -73,27 +68,27 @@ Note: You need to authenticate after saving your key and secret above
 <br/>
 
 <div>
-    <b>Customer Count:</b> <%= Customer.count%>
+    <b><%=t(:label_customer_count)%>:</b> <%= Customer.count%>
     </div>
       
     <div>
-        <b>Item Count:</b> <%= QboItem.count %>
+        <b><%=t(:label_item_count)%>:</b> <%= QboItem.count %>
     </div>
       
     <div>
-        <b>Employee Count:</b> <%= QboEmployee.count %>
+        <b><%=t(:label_employee_count)%>:</b> <%= QboEmployee.count %>
     </div>
     
     <div>
-        <b>Invoice Count:</b> <%= QboInvoice.count %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= QboInvoice.count %>
     </div>
     
     <div>
-        <b>Estimate Count:</b> <%= QboEstimate.count %>
+        <b><%=t(:label_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 %>
+        <b><%=t(:label_last_sync)%> </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
 </div>

app/views/qbo/_sidebar.html.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'customers/sidebar' %>
+<%= render :partial => 'estimates/sidebar' %>

app/views/qbo/_stats.html.erb

@@ -1 +1 @@
-<%= Customer.count %> Customers - <%= render :partial => 'qbo/last_sync' %>
+<%= Customer.count %> <%=t(:field_customers)%> - <%= render :partial => 'qbo/last_sync' %>

app/views/qbo/index.html.erb

@@ -11,32 +11,32 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 -->
 
 <body>
-    <h1> Redmine Quickbooks</h1>
+    <h1><%=t(:label_redmine_qbo)%></h1>
     
     <div>
-        <b>Customer Count:</b> <%= @customer_count.to_s%>
+        <b><%=t(:label_customer_count)%>:</b> <%= @customer_count.to_s%>
     </div>
       
     <div>
-        <b>Item Count:</b> <%= @qbo_item_count.to_s %>
+        <b><%=t(:label_item_count)%>:</b> <%= @qbo_item_count.to_s %>
     </div>
       
     <div>
-        <b>Employee Count:</b> <%= @qbo_employee_count.to_s %>
+        <b><%=t(:label_employee_count)%>:</b> <%= @qbo_employee_count.to_s %>
     </div>
     
     <div>
-        <b>Invoice Count:</b> <%= @qbo_invoice_count.to_s %>
+        <b><%=t(:label_invoice_count)%>:</b> <%= @qbo_invoice_count.to_s %>
     </div>
     
     <div>
-        <b>Estimate Count:</b> <%= @qbo_estimate_count.to_s %>
+        <b><%=t(:label_estimate_count)%>:</b> <%= @qbo_estimate_count.to_s %>
     </div>
       
     <br/>
     
     <div>
-        <b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
+        <b><%=t(:label_last_sync)%>: </b> <%= Qbo.last_sync if Qbo.exists? %>
     </div>
     
 </body>

app/views/vehicles/_details.html.erb

@@ -2,36 +2,34 @@
   <tbody>
   
     <tr>
-      <th>Customer</th>
+      <th><%= t(:field_customer)%></th>
       <td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
     </tr>
   
     <tr>
-      <th>Vehicle</th>
+      <th><%= t(:field_vehicle) %></th>
       <td><%= vehicle.to_s %></td>
     </tr>
     
     <tr>
-      <th>VIN</th>
+      <th><%= t(:field_vin) %></th>
       <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
     </tr>
     
     <tr>
-      <th>Notes</th>
+      <th><%= t(:field_notes) %></th>
       <td><%= vehicle.notes %></td>
     </tr>
     
     <tr>
-        <th>Issues</th>
+        <th> <%= t(:issues) %> </th>
         <td><%= vehicle.issues.count %></td>
     </tr>
     
     <tr>
-      <td/>
       <td>
-      
+        <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
-        <%= button_to "Edit", edit_vehicle_path(vehicle), method: :get%> 
+        <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
-        <%= button_to "Delete", vehicle, method: :delete, data: {confirm: "You sure?"} %> 
       </td>
     </tr>
   </tbody>

app/views/vehicles/_form.html.erb

@@ -4,43 +4,43 @@
 
       <%= form_for @vehicle do |f| %> 
         <div class="clearfix">
-		Customer:
+		      <%=t(:field_customer)%>:
-	  <div class="input">
+	        <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.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 %>
+            <%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
-            </div>
+          </div>
         </div>
         
         <div class="clearfix">
-          Year: 
+          <%=t(:label_year)%>: 
           <div class="input">
             <%= f.number_field :year %>
           </div>
         </div>
         
         <div class="clearfix">
-          Make:
+          <%=t(:label_make)%>:
           <div class="input">
             <%= f.text_field :make %>
           </div>
         </div>
         
         <div class="clearfix">
-          Model:
+          <%=t(:label_model)%>:
           <div class="input">
             <%= f.text_field :model %>
           </div>
         </div>
         
         <div class="clearfix">
-          VIN:
+          <%=t(:field_vin)%>:
           <div class="input">
             <%= f.text_field :vin , :autofocus => true %>
           </div>
         </div>
         
         <div class="clearfix">
-          Notes: 
+          <%=t(:field_notes)%>: 
           <div class="input">
             <%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
           </div>

app/views/vehicles/_list.html.erb

@@ -21,8 +21,8 @@
     <%= will_paginate @vehicles %>
   </div>
 
-<p>Matching <%= @vehicles.count %> Vehicles </p>
+<p><%=t(:label_matching)%> <%=@vehicles.count%> <%=t(:field_vehicles) %> </p>
 
 <% else %>
-  <p>There are no vehicles containing the term(s) <%= params[:search] %>.</p>
+  <p><%=t(:label_no_vehicles)%> <%= params[:search] %>.</p>
 <% end %>

app/views/vehicles/_search.html.erb

@@ -1,4 +1,4 @@
 <%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: "Search Vehicles by VIN" %>
+  <%= text_field_tag :search, params[:search], placeholder: t(:label_seach_vin) %>
-  <%= submit_tag "Search" %>
+  <%= submit_tag t(:label_search) %>
 <% end %>

app/views/vehicles/edit.html.erb

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

app/views/vehicles/index.html.erb

@@ -1,4 +1,4 @@
-<h2>Customer Vehicles <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2> 
+<h2><%=t(:label_cusomer_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 @@
-<h2>New Customer Vehicle</h2> 
+<h2><%=t(:label_new_vehicle)%></h2> 
 <br/> 
 <%= render :partial => 'vehicles/form' %>

app/views/vehicles/show.html.erb

@@ -1,8 +1,14 @@
-<h2>Vehicle #<%=@vehicle.id%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
-<br/> 
+<br/>
 
 <div style="text-align: left; width:90%;">
   <%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
 
-  <%= render :partial => 'issues/list_simple', locals: {issues: @vehicle.issues} %>
+  <p> <b> <%=t(:label_open_issues)%> </b>  </p>
+
+  <%= render :partial => 'issues/list_simple', locals: {issues: @vehicle.issues.open} %>
+
+  <p> <b> <%=t(:label_closed_issues)%> </b> </p>
+
+  <%= render :partial => 'issues/list_simple', locals: {issues: (@vehicle.issues - @vehicle.issues.open)} %>
 </div>

config/locales/en.yml

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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:
 #
@@ -9,6 +9,7 @@
 #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.
 
 # English strings go here for Rails i18n
+# Usage t(:label)
 en:
   # my_label: "My label"
   field_customer: "Customer"
@@ -16,9 +17,60 @@ en:
   field_qbo_employee: "Employee"
   field_qbo_invoice: "Invoice"
   field_qbo_estimate: "Estimate" 
-  field_vehicles: "Vehicle"
+  field_vehicles: "Vehicles"
   field_vehicle: "Vehicle"
   field_vin: "VIN"
   field_notes: "Notes"
   field_qbo_billed: "Billed"
   label_week: "Week"
+  label_search_estimates: "Search Estimates"
+  label_search: "Search"
+  label_estimates: "Estimates"
+  label_401: "Not Authorized"
+  warn_ru_sure: "You sure?"
+  label_delete: "Delete"
+  label_edit: "Edit"
+  label_year: "Year"
+  label_make: " Make"
+  label_model: "Model"
+  label_no_vehicles: "There are no vehicles containing the term(s)"
+  label_no_customers: "There are no customers containing the term(s)"
+  label_matching: "Matching "
+  label_search_vin: "Search Vehicles by VIN"
+  label_edit_customer_vehicle: "Edit Customer Vehicle"
+  label_cusomer_vehicles: "Customer Vehicles"
+  label_new_vehicle: "New Customer Vehicle"
+  label_open_issues: "Open Issues"
+  label_closed_issues: "Closed Issues"
+  label_sync: "Sync"
+  label_new_customer: "New Customer"
+  label_search_customers: "Search Customers"
+  label_customers: "Customers"
+  label_edit_customer: "Edit Customer"
+  label_email: "Email"
+  label_primary_phone: "Primary Phone"
+  label_mobile_phone: "Mobile Phone"
+  label_billing_address: "Billing Address"
+  label_shipping_address: "Shipping Address"
+  label_account_balance: "Account Balance"
+  label_balance_with_jobs: "Balance With Jobs"
+  label_display_name: "Display Name"
+  label_details: "Details"
+  label_customer_link_expires: "This customer link expires in"
+  label_new_payment: "New Payment"
+  label_amount: "Amount"
+  label_payment_method: "Payment Method"
+  label_deposit_into: "Deposit to Account"
+  label_last_sync: "Last Sync"
+  label_redmine_qbo: "Redmine Quickbooks"
+  label_customer_count: "Customer Count"
+  label_invoice_count: "Invoice Count"
+  label_estimate_count: "Estimate Count"
+  label_item_count: "Item Count"
+  label_employee_count: "Employee Count"
+  label_client_id: "Intuit QBO OAuth2 Client ID"
+  label_client_secret: "Intuit QBO OAuth2 Client Secret"
+  label_webhook_token: "Intuit QBO Webhook Token"
+  label_oauth_expires: "OAuth2 Access Token Expires At"
+  label_oauth_note: "Note: You need to authenticate with Quickbooks after saving your key and secret above"
+  field_customers: "Customers"

config/routes.rb

@@ -20,6 +20,7 @@ get 'qbo/sync', :to => 'qbo#sync'
 
 # Estimate & Invoice PDF
 get 'qbo/estimate/:id', :to => 'estimate#show', as: :estimate
+get 'qbo/estimate/doc/:id', :to => 'estimate#doc', as: :estimate_doc
 get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
 
 #manual billing
@@ -47,3 +48,5 @@ end
 
 #allow for just vehicles too
 resources :vehicles
+
+#resources :qbo_estimates

db/migrate/001_create_qbos.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQbos < ActiveRecord::Migration
+class CreateQbos < ActiveRecord::Migration[5.1]
   
   def change
     create_table :qbos do |t|

db/migrate/002_create_qbo_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboCustomers < ActiveRecord::Migration
+class CreateQboCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_customers, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/003_update_issues.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateIssues < ActiveRecord::Migration
+class UpdateIssues < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_customer, index: true
     add_reference :issues, :qbo_item, index: true

db/migrate/004_create_qbo_items.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboItems < ActiveRecord::Migration
+class CreateQboItems < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_items, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/005_create_qbo_employees.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboEmployees < ActiveRecord::Migration
+class CreateQboEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_employees, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/006_update_users.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateUsers < ActiveRecord::Migration
+class UpdateUsers < ActiveRecord::Migration[5.1]
   def change
     add_reference :users, :qbo_employee, index: true
   end

db/migrate/007_update_time_entries.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateTimeEntries < ActiveRecord::Migration
+class UpdateTimeEntries < ActiveRecord::Migration[5.1]
   def change
     add_column :time_entries, :qbo_billed, :boolean, :default => false
   end

db/migrate/008_create_qbo_estimates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboEstimates < ActiveRecord::Migration
+class CreateQboEstimates < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_estimates, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/009_update_qbos.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateQbos < ActiveRecord::Migration
+class UpdateQbos < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbos, :token, :qb_token
     rename_column :qbos, :secret, :qb_secret

db/migrate/010_update_issues_with_estimates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateIssuesWithEstimates < ActiveRecord::Migration
+class UpdateIssuesWithEstimates < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_estimate, index: true
   end

db/migrate/011_create_qbo_invoices.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboInvoices < ActiveRecord::Migration
+class CreateQboInvoices < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_invoices, id: false do |t|
       t.integer :id, :options => 'PRIMARY KEY'

db/migrate/012_update_issues_with_invoices.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateIssuesWithInvoices< ActiveRecord::Migration
+class UpdateIssuesWithInvoices< ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :qbo_invoice, index: true
   end

db/migrate/013_create_qbo_purchases.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 CreateQboPurchases< ActiveRecord::Migration
+class CreateQboPurchases< ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_purchases, id: false do |t| 
       t.integer :id, :options => 'PRIMARY KEY' 

db/migrate/014_update_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateCustomers < ActiveRecord::Migration
+class UpdateCustomers < ActiveRecord::Migration[5.1]
   def change
     add_reference :qbo_customers, :qbo_purchase, index: true
   end

db/migrate/015_update_qbo_purchases.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateQboPurchases < ActiveRecord::Migration
+class UpdateQboPurchases < ActiveRecord::Migration[5.1]
   def change
     rename_column :qbo_purchases, :customer_id, :qbo_customer_id
   end

db/migrate/016_create_vehicles.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class CreateVehicles < ActiveRecord::Migration
+class CreateVehicles < ActiveRecord::Migration[5.1]
   
   def change  
     create_table :vehicles do |t| 

db/migrate/017_update_issues_with_vehicles.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateIssuesWithVehicles < ActiveRecord::Migration
+class UpdateIssuesWithVehicles < ActiveRecord::Migration[5.1]
   def change
     add_reference :issues, :vehicles, index: true
   end

db/migrate/018_update_vehicles.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateVehicles < ActiveRecord::Migration
+class UpdateVehicles < ActiveRecord::Migration[5.1]
   def change
     add_column :vehicles, :name, :text
   end

db/migrate/019_qbocustomers_to_customers.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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
+class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
   def change
     rename_table :qbo_customers, :customers
     rename_column :issues, :qbo_customer_id, :customer_id

db/migrate/020_update_qbos_time_stamp.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class UpdateQbosTimeStamp < ActiveRecord::Migration
+class UpdateQbosTimeStamp < ActiveRecord::Migration[5.1]
   def change
     add_column :qbos, :last_sync, :datetime 
   end

db/migrate/021_add_issues_qbo_invoices.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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
+class AddIssuesQboInvoices < ActiveRecord::Migration[5.1]
   def self.up
     create_table :issues_qbo_invoices, :id => false do |t|
       t.references :issue

db/migrate/022_update_issues_remove_invoice.rb

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

db/migrate/023_create_customer_tokens.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2016 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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
+class CreateCustomerTokens < ActiveRecord::Migration[5.1]
   def change
     create_table :customer_tokens do |t|
       t.string :token

db/migrate/024_update_invoices_and_estimates.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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
+class UpdateInvoicesAndEstimates < ActiveRecord::Migration[5.1]
   def change
     add_reference :qbo_invoices, :customer, index: true
     add_reference :qbo_estimates, :customer, index: true

db/migrate/025_update_projects.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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
+class UpdateProjects < ActiveRecord::Migration[5.1]
   def change
     add_reference :projects, :customer, index: true
     add_reference :projects, :vehicle, index: true

db/migrate/026_create_line_items.rb

@@ -1,6 +1,6 @@
 #The License
 #
-#Copyright (c) 2018 Rick Barrette - All Rights Reserved
+#Copyright (c) 2022 Rick Barrette - All Rights Reserved
 # 
 #Unauthorized copying of this software and associated documentation files (the "Software"), via any medium is strictly prohibited.
 #
@@ -10,7 +10,7 @@
 #
 #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
+class CreateLineItems < ActiveRecord::Migration[5.1]
   def change  
     create_table :line_items do |t| 
       t.integer  :item_id

db/migrate/027_add_customers_phone_number.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2019 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 AddCustomersPhoneNumber < ActiveRecord::Migration
+class AddCustomersPhoneNumber < ActiveRecord::Migration[5.1]
   def change
     add_column :customers, :phone_number, :string
   end

db/migrate/028_add_customers_mobile_phone_number.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2019 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 AddCustomersMobilePhoneNumber < ActiveRecord::Migration
+class AddCustomersMobilePhoneNumber < ActiveRecord::Migration[5.1]
   def change
     add_column :customers, :mobile_phone_number, :string
   end

db/migrate/029_update_qbos_types.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateQbosTypes < ActiveRecord::Migration
+class UpdateQbosTypes < ActiveRecord::Migration[5.1]
   
   def change
     change_column :qbos, :qb_token, :text

db/migrate/030_update_qbos_token.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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,7 +8,7 @@
 #
 #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 UpdateQbosToken < ActiveRecord::Migration
+class UpdateQbosToken < ActiveRecord::Migration[5.1]
   
   def change
     add_column :qbos, :token, :text

db/migrate/031_remove_qbos_keys.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,11 +8,11 @@
 #
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# This sidekiq worker class will handle emailing weekly time reports
+class RemoveQbosKeys < ActiveRecord::Migration[5.1]
-class EmailWorker
+  def change
-  include Sidekiq::Worker
+    remove_column :qbos, :qb_secret
-  
+    remove_column :qbos, :token_expires_at
-  def perform()
+    remove_column :qbos, :reconnect_token_at
-    # email something
+    remove_column :qbos, :qb_token
   end
 end

init.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#Copyright (c) 2022 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:
 #
@@ -28,10 +28,11 @@ Redmine::Plugin.register :redmine_qbo do
     require_dependency 'pdf_patch'
     require_dependency 'attachments_controller_patch'
 
+    # About
     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.8.1'
+    version '1.0.0'
     url 'https://github.com/rickbarrette/redmine_qbo'
     author_url 'http://rickbarrette.org'
     settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -53,6 +54,7 @@ Redmine::Plugin.register :redmine_qbo do
     # set per_page globally
     WillPaginate.per_page = 20
   
+    # Permissions for security
     permission :view_customers, :customers => :index, :public => false
     permission :add_customers, :customers => :new, :public => false
     permission :view_payments, :payments => :index, :public => false

lib/issues_form_hook_listener.rb

@@ -9,35 +9,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.
 
 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
     if context[:project]
       selected_customer = context[:project].customer ? context[:project].customer.id : nil
       selected_vehicle = context[:project].vehicle ? context[:project].vehicle.id : nil
     end
- 
+
     # Check to see if there is a quickbooks user attached to the issue
     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
-    
+
     # Load customer information
-    customer = Customer.find_by_id(selected_customer) if selected_customer   
+    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"
+    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",
+      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
+
     if context[:issue].customer
       if customer.vehicles
         vehicles = customer.vehicles.pluck(:name, :id)
@@ -49,12 +56,12 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
       vehicles = [nil].compact
       estimates = [nil].compact
     end
-    
+
      # Generate the drop down list of quickbooks extimates
     select_estimate = f.select :qbo_estimate_id, estimates, :selected => selected_estimate, include_blank: true
-    
+
     vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
-    
+
     return "<p><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

@@ -10,6 +10,12 @@
 
 class IssuesSaveHookListener < Redmine::Hook::ViewListener
 
+  # Called Before Issue Saved
+  def controller_issues_edit_before_save(context={})
+    issue = context[:issue]
+    issue.subject = issue.subject.titleize
+  end
+
   # Called After Issue Saved
   def controller_issues_edit_after_save(context={})
     issue = context[:issue]

lib/pdf_patch.rb

@@ -1,3 +1,13 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2022 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 'redmine/export/pdf'
 require_dependency 'redmine/export/pdf/issues_pdf_helper'
 
@@ -7,7 +17,9 @@ module IssuesPdfHelperPatch
     base.send(:include, InstanceMethods)
     base.class_eval do
       unloadable # Send unloadable so it will not be unloaded in development
-      alias_method_chain :issue_to_pdf, :patch
+      alias_method :issue_to_pdf, :issue_to_pdf_with_patch
+      alias_method :issue_to_pdf_with_patch, :issue_to_pdf
+      
     end
   end
 

lib/query_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,62 +11,24 @@
 require_dependency 'issue_query'
 
 module QueryPatch
-
+  
-  def self.included(base) # :nodoc:
+  # Add qbo options to the aviable columns
-    base.extend(ClassMethods)
+  def available_columns
-
+    unless @available_columns
-    base.send(:include, InstanceMethods)
+      @available_columns = self.class.available_columns.dup
-
+      @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
-    # Same as typing in the class 
+      @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
-    base.class_eval do
-      unloadable # Send unloadable so it will not be unloaded in development
-      
-      alias_method_chain :available_columns, :qbo
-      alias_method_chain :available_filters, :qbo
     end
-  end
+    super
-      
-  module ClassMethods
-    
   end
   
-  module InstanceMethods
+  # Add customers to filters
-  
+  def initialize_available_filters
-    def available_columns_with_qbo
+    add_available_filter "customer", :type => :text
-      unless @available_columns
+    super
-        @available_columns = available_columns_without_qbo
-        @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
-        @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
-      end
-      @available_columns
-    end
-    
-    def available_filters_with_qbo
-      unless @available_filters
-        @available_filters = available_filters_without_qbo 
-        
-        #qbo_filters = {
-        #  :customer => { 
-        #    :id => l(:field_customer),
-        #    :type => :integer, 
-        #    :order => @available_filters.size + 1},
-        #}
-        
-        #qbo_filters = { 
-        #  "customer_id" => {
-        #    :id => :customer_id,
-        #    :type => :list_optional
-            #:order => @available_filters.size + 1,
-            #:values => Customer.find(:all).collect { |c| [c.name, c.id.to_s]}
-        #  }
-        #}
-        
-        #@available_filters.merge!(qbo_filters)
-      end
-      @available_filters
-    end
   end
+
 end
 
 # Add module to Issue
-IssueQuery.send(:include, QueryPatch)
+IssueQuery.send(:prepend, QueryPatch)

lib/time_entry_query_patch.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#Copyright (c) 2022 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,60 +12,22 @@ require_dependency 'time_entry_query'
 
 module TimeEntryQueryPatch
 
-  def self.included(base) # :nodoc:
+  # Add QBO options to columns
-    base.extend(ClassMethods)
+  def available_columns
-
+    unless @available_columns
-    base.send(:include, InstanceMethods)
+      @available_columns = self.class.available_columns.dup
-
+      @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
-    # 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
+    super
-      
-  module ClassMethods
-    
   end
   
-  module InstanceMethods
+  # Add QBO options to the filter
-  
+  def initialize_available_filters
-    def available_columns_with_qbo_billed
+    add_available_filter "qbo_billed", :type => :boolean
-      unless @available_columns
+    super
-        @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)
+TimeEntryQuery.send(:prepend, QueryPatch)

lib/view_hook_listener.rb

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