Add customer details translation and fix link in appointment action

README.md

@@ -35,6 +35,7 @@ The goal of this project is to allow Redmine to connect with QuickBooks Online t
     * **Invoices:** Automatically attached to an Issue if a line item contains a hashtag number (e.g., `#123`).
     * **Custom Fields:** Invoice Custom Fields are matched to Issue Custom Fields and are automatically updated in QuickBooks. (Useful for extracting Mileage In/Out from the Issue to update the Invoice).
     * **Sync:** Customers are automatically updated in the local database.
+* **Plugin View Hooks** Allows intergration of other features supported by companion plugins, for example [redmine_qbo_vehicles](https://github.com/rickbarrette/redmine_qbo_vehicles) adds customer vehicle interation
 
 ## Prerequisites
 
@@ -88,13 +89,13 @@ The goal of this project is to allow Redmine to connect with QuickBooks Online t
 
 To enable automatic Time Activity entries for an Issue, you simply need to assign a Customer to an Issue via the dropdowns in the issue creation/update form.
 
-**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.
+**Note:** After the initial synchronization, this plugin will receive push notifications via Intuit's webhook service.   
 
-## TODO
-
-*   Add hooks to intergrate other plugins, i.e. customer vehicles for example
-*   MORE Stuff as I make it up...
-    
+## Companion Plugin Hooks
+* :pdf_left, { issue: issue }
+* :pdf_right, { issue: issue }
+* :process_invoice_custom_fields, { issue: issue, invoice: invoice } 
+* :show_customer_view_right, {customer: @customer}
 
 ## License
 

app/controllers/customers_controller.rb

@@ -26,13 +26,13 @@ class CustomersController < ApplicationController
   include SortHelper
   helper :timelog
 
-  before_action :add_customer, :only => :new
-  before_action :view_customer, :except => [:new, :view]
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
+  before_action :add_customer, only: :new
+  before_action :view_customer, except: [:new, :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]
+  autocomplete :customer, :name, full: true, extra_data: [:id]
 
   def allowed_params
     params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
@@ -53,7 +53,7 @@ class CustomersController < ApplicationController
   # display a list of all customers
   def index
     if params[:search]
-      @customers = Customer.search(params[:search]).paginate(:page => params[:page])
+      @customers = Customer.search(params[:search]).paginate(page: params[:page])
       if only_one_non_zero?(@customers)
         redirect_to @customers.first
       end
@@ -69,7 +69,7 @@ class CustomersController < ApplicationController
   def create
     @customer = Customer.new(allowed_params)
     if @customer.save
-      flash[:notice] = "New Customer Created"
+      flash[:notice] = t :notice_customer_created
       redirect_to @customer
     else
       flash[:error] = @customer.errors.full_messages.to_sentence
@@ -90,6 +90,7 @@ class CustomersController < ApplicationController
       @issues.open.each { |i| @hours+= i.total_spent_hours }
       @closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
     rescue 
+      flash[:error] = t :notice_customer_not_found
       render_404
     end
   end
@@ -99,6 +100,7 @@ class CustomersController < ApplicationController
     begin
       @customer = Customer.find_by_id(params[:id])
     rescue 
+      flash[:error] = t :notice_customer_not_found
       render_404
     end
   end
@@ -108,13 +110,14 @@ class CustomersController < ApplicationController
     begin
       @customer = Customer.find_by_id(params[:id])
       if @customer.update(allowed_params)
-        flash[:notice] = "Customer updated"
+        flash[:notice] = t :notice_customer_updated
         redirect_to @customer
       else
         redirect_to edit_customer_path
         flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
       end
     rescue 
+      flash[:error] = t :notice_customer_not_found
       render_404
     end
   end
@@ -123,9 +126,10 @@ class CustomersController < ApplicationController
   def destroy
     begin
       Customer.find_by_id(params[:id]).destroy
-      flash[:notice] = "Customer deleted successfully"
+      flash[:notice] = t :notice_customer_deleted
       redirect_to action: :index
     rescue 
+      flash[:error] = t :notice_customer_not_deleted
       render_404
     end
   end
@@ -143,6 +147,7 @@ class CustomersController < ApplicationController
       issue = Issue.find_by_id(params[:id])
       redirect_to view_path issue.share_token.token
     rescue
+      flash[:error] = t :notice_issue_not_found
       render_404
     end
   end
@@ -161,7 +166,7 @@ class CustomersController < ApplicationController
       @issue = Issue.find @token.issue_id
       @journals = @issue.journals.
         preload(:details).
-        preload(:user => :email_address).
+        preload(user: :email_address).
         reorder(:created_on, :id).to_a
       @journals.each_with_index {|j,i| j.indice = i+1}
       @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
@@ -175,9 +180,10 @@ class CustomersController < ApplicationController
       @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
       @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
       @priorities = IssuePriority.active
-      @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
+      @time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
       @relation = IssueRelation.new
     rescue
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end

app/controllers/estimate_controller.rb

@@ -11,8 +11,8 @@ class EstimateController < ApplicationController
   
   include AuthHelper
   
-  before_action :require_user, :unless => proc {|c| session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+  before_action :require_user, unless: proc {|c| session[:token].nil? }
+  skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
 
   def get_estimate
     # Force sync for estimate by doc number if not found
@@ -36,9 +36,9 @@ class EstimateController < ApplicationController
     estimate = get_estimate
 
     begin
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
     rescue
-      redirect_to :back, :flash => { :error => "Estimate not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
     end
   end
 
@@ -49,9 +49,9 @@ class EstimateController < ApplicationController
     estimate = get_estimate
     
     begin
-      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
+      send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", disposition: :inline, type: "application/pdf"
     rescue
-      redirect_to :back, :flash => { :error => "Estimate not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_estimate_not_found) }
     end
   end
 

app/controllers/invoice_controller.rb

@@ -12,8 +12,8 @@ class InvoiceController < ApplicationController
   include AuthHelper
   require 'combine_pdf'
 
-  before_action :require_user, :unless => proc {|c| session[:token].nil? }
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
+  before_action :require_user, 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
@@ -23,7 +23,7 @@ class InvoiceController < ApplicationController
     begin
       qbo = Qbo.first
         qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
         
         # If multiple id's then pull each pdf & combine them
         if params[:invoice_ids]
@@ -45,10 +45,10 @@ class InvoiceController < ApplicationController
           ref = invoice.doc_number
         end
 
-        send_data @pdf, filename: "invoice #{ref}.pdf", :disposition => 'inline', :type => "application/pdf"
+        send_data @pdf, filename: "invoice #{ref}.pdf", disposition: :inline, type: "application/pdf"
       end
     rescue
-      redirect_to :back, :flash => { :error => "Invoice not found" }
+      redirect_to :back, flash: { error: I18n.t(:notice_invoice_not_found) }
     end
   end
 end

app/controllers/qbo_controller.rb

@@ -14,8 +14,8 @@ class QboController < ApplicationController
   
   include AuthHelper
   
-  before_action :require_user, :except => :webhook
-  skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
+  before_action :require_user, except: :webhook
+  skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:webhook]
 
   def allowed_params
     params.permit(:code, :state, :realmId, :id)
@@ -51,9 +51,9 @@ class QboController < ApplicationController
         qbo.refresh_token!
         
         if qbo.save!
-          redirect_to qbo_sync_path, :flash => { :notice => I18n.t(:label_connected) }
+          redirect_to qbo_sync_path, flash: { notice: I18n.t(:label_connected) }
         else
-          redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => I18n.t(:label_error) }
+          redirect_to plugin_settings_path(:redmine_qbo), flash: { error: I18n.t(:label_error) }
         end
         
       end
@@ -65,9 +65,9 @@ class QboController < ApplicationController
     i = Issue.find_by_id params[:id]
     if i.customer
       i.bill_time
-      redirect_to i, :flash => { :notice => I18n.t(:label_billed_success) + i.customer.name }
+      redirect_to i, flash: { notice: I18n.t(:label_billed_success) + i.customer.name }
     else
-      redirect_to i, :flash => { :error => I18n.t(:label_billing_error) }
+      redirect_to i, flash: { error: I18n.t(:label_billing_error) }
     end
   end
   
@@ -125,7 +125,7 @@ class QboController < ApplicationController
         ActiveRecord::Base.connection.close
       end
       # The webhook doesn't require a response but let's make sure we don't send anything
-      render :nothing => true, status: 200
+      render nothing: true, status: 200
     else
       render nothing: true, status: 400
     end
@@ -152,6 +152,6 @@ class QboController < ApplicationController
       ActiveRecord::Base.connection.close
     end
 
-    redirect_to :home, :flash => { :notice => I18n.t(:label_syncing) }
+    redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
   end
 end

app/helpers/auth_helper.rb

@@ -13,6 +13,7 @@ module AuthHelper
   def require_user
     return unless session[:token].nil?
     if !User.current.logged?
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end
@@ -27,6 +28,7 @@ module AuthHelper
   
   def check_permission(permission)
     if !allowed_to?(permission)
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end
@@ -34,6 +36,7 @@ module AuthHelper
   
   def global_check_permission(permission)
     if !globaly_allowed_to?(permission)
+      flash[:error] = t :notice_forbidden
       render_403
     end
   end

app/models/concerns/quickbooks_oauth.rb

@@ -73,7 +73,7 @@ module QuickbooksOauth
       oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
 
       # Are we are playing in the sandbox?
-      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo['sandbox'] ? true : false
+      Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false
       logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}"
 
       options = {

app/models/customer.rb

@@ -142,7 +142,7 @@ class Customer < ActiveRecord::Base
     # Sync ALL customers if the database is empty
     qbo = Qbo.first
     customers = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
       service.all
     end
     
@@ -178,7 +178,7 @@ class Customer < ActiveRecord::Base
   def self.sync_by_id(id) 
     qbo = Qbo.first
     c = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
       service.fetch_by_id(id)
     end
 
@@ -205,7 +205,7 @@ class Customer < ActiveRecord::Base
     begin
       qbo = Qbo.first
       @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
         service.update(@details)
       end
       #raise "QBO Fault" if @details.fault?
@@ -227,7 +227,7 @@ class Customer < ActiveRecord::Base
       raise Exception unless self.id
       qbo = Qbo.first
       @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
         service.fetch_by_id(self.id)
       end
     rescue Exception => e

app/models/customer_token.rb

@@ -55,7 +55,7 @@ class CustomerToken < ActiveRecord::Base
     end
 
     # only create new token if we have an issue to attach it to
-    return create(:issue_id => issue.id) if User.current.logged?
+    return create(issue_id: issue.id) if User.current.logged?
   end
 
 end

app/models/employee.rb

@@ -16,14 +16,13 @@ class Employee < ActiveRecord::Base
   def self.sync 
     qbo = Qbo.first
     employees = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
       service.all
     end
 
     return unless employees
     
     transaction do
-      # Update the item table
       employees.each { |e|
         logger.info "Processing employee #{e.id}"
         employee = 	find_or_create_by(id: e.id)
@@ -37,7 +36,7 @@ class Employee < ActiveRecord::Base
   def self.sync_by_id(id)
     qbo = Qbo.first
     employee = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
       service.fetch_by_id(id)
     end
 

app/models/estimate.rb

@@ -14,13 +14,18 @@ class Estimate < ActiveRecord::Base
   belongs_to :customer 
   validates_presence_of :doc_number, :id
   self.primary_key = :id
+
+  # returns a human readable string
+  def to_s
+    return self[:doc_number]
+  end
   
   # sync all estimates
   def self.sync
     logger.info "Syncing ALL estimates"
     qbo = Qbo.first
     estimates = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
       service.all
     end
 
@@ -39,7 +44,7 @@ class Estimate < ActiveRecord::Base
     logger.info "Syncing estimate #{id}"
     qbo = Qbo.first
     qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
       process_estimate(service.fetch_by_id(id))
     end
   end
@@ -49,17 +54,16 @@ class Estimate < ActiveRecord::Base
     logger.info "Syncing estimate by doc number #{number}"
     qbo = Qbo.first
     qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
       process_estimate(service.find_by( :doc_number, number).first)
     end
   end
   
   # update an estimate
   def self.update(id)
-    # Update the item table
     qbo = Qbo.first
     estimate = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
       service.fetch_by_id(id)
     end
 
@@ -86,7 +90,7 @@ class Estimate < ActiveRecord::Base
   def pdf
     qbo = Qbo.first
     qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
       estimate = service.fetch_by_id(id)
       service.pdf(estimate)
     end
@@ -118,7 +122,7 @@ class Estimate < ActiveRecord::Base
       raise Exception unless self.id
       qbo = Qbo.first
       @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
         service(:estimate).fetch_by_id(self.id)
       end
     rescue Exception => e

app/models/invoice.rb

@@ -14,6 +14,11 @@ class Invoice < ActiveRecord::Base
   belongs_to :customer 
   validates_presence_of :doc_number, :id, :customer_id, :txn_date
   self.primary_key = :id
+
+   # returns a human readable string
+  def to_s
+    return self[:doc_number]
+  end
   
   # sync ALL the invoices
   def self.sync
@@ -27,7 +32,7 @@ class Invoice < ActiveRecord::Base
     # .all() is never called since count is never initialized
     qbo = Qbo.first
     invoices = qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
       service.all 
     end
 
@@ -43,7 +48,7 @@ class Invoice < ActiveRecord::Base
     logger.info "Syncing invoice #{id}"
     qbo = Qbo.first
     qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
       invoice = service.fetch_by_id(id) 
       process_invoice invoice
     end
@@ -146,7 +151,7 @@ class Invoice < ActiveRecord::Base
       logger.info "Invoice.push_updates"
       qbo = Qbo.first
       qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
         service.update invoice
       end
     rescue
@@ -162,7 +167,7 @@ class Invoice < ActiveRecord::Base
   def pdf
     qbo = Qbo.first
     qbo.perform_authenticated_request do |access_token|
-      service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+      service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
       invoice = service.fetch_by_id(id)
       return service.pdf(invoice)
     end
@@ -192,7 +197,7 @@ class Invoice < ActiveRecord::Base
       raise Exception unless self.id
       qbo = Qbo.first
       @details = qbo.perform_authenticated_request do |access_token|
-        service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+        service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
         service.fetch_by_id(self.id)
       end
     rescue Exception => e

app/views/customers/_actions.html.erb

@@ -1,4 +1,4 @@
-<%= link_to t(:label_appointment), "https://calendar.google.com/calendar/render?action=TEMPLATE&text=#{@customer.name}+-&details=#{ link_to "Customer Details", "https://#{Setting.host_name}#{customer_path @customer.id}"}%0A#{@customer.primary_phone}&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank %>
+<%= link_to t(:label_appointment), "https://calendar.google.com/calendar/render?action=TEMPLATE&text=#{@customer.name}+-&details=#{ link_to t(:customer_details), "https://#{Setting.host_name}#{customer_path @customer.id}"}%0A#{@customer.primary_phone}&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank %>
 
 <br/>
 <br/>

app/views/customers/_form.html.erb

@@ -7,28 +7,28 @@
         <div class="clearfix">
           <%=t(:label_display_name)%> 
           <div class="input">
-            <%= f.text_field :name, :required => true, :autocomplete => "off" %>
+            <%= f.text_field :name, required: true, autocomplete: "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_primary_phone)%>
           <div class="input">
-            <%= f.telephone_field :primary_phone, :autocomplete => "off" %>
+            <%= f.telephone_field :primary_phone, autocomplete: "off" %>
           </div>
         </div>
         
        <div class="clearfix">
           <%=t(:label_mobile_phone)%>:
           <div class="input">
-            <%= f.telephone_field :mobile_phone, :autocomplete => "off" %>
+            <%= f.telephone_field :mobile_phone, autocomplete: "off" %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_email)%>:
           <div class="input">
-            <%= f.email_field :email, :autocomplete => "off" %>
+            <%= f.email_field :email, autocomplete: "off" %>
           </div>
         </div>
         
@@ -36,16 +36,16 @@
           <%=t(:field_notes)%>: 
           <div class="input">
             <p>  
-              <%= content_tag 'span', :id => "issue_description_and_toolbar" do %>
+              <%= content_tag :span, id: "issue_description_and_toolbar" do %>
               <%= f.text_area :notes,
-                    :cols => 60,
-                    :rows => 10,
-                    :accesskey => accesskey(:edit),
-                    :class => 'wiki-edit',
-                    :no_label => true %>
+                    cols: 60,
+                    rows: 10,
+                    accesskey: accesskey(:edit),
+                    class: 'wiki-edit',
+                    no_label: true %>
               <% end %>
             </p>
-            <%= wikitoolbar_for 'issue_description' %>
+            <%= wikitoolbar_for :issue_description %>
           </div>
         </div>
         

app/views/customers/_search.html.erb

@@ -1,5 +1,5 @@
-<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+<%= form_tag(customers_path, method: "get", id: "search-form") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
     <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>

app/views/customers/_sidebar.html.erb

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

app/views/customers/edit.html.erb

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

app/views/customers/filter_estimates_by_customer.js.erb

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

app/views/customers/index.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_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| %>
@@ -20,5 +20,5 @@
 <% end %>
 
 <div>
-  <%= render :partial => 'qbo/stats' %>
+  <%= render partial: 'qbo/stats' %>
 </div>

app/views/customers/new.html.erb

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

app/views/customers/show.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo['sandbox'] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
+<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo[:sandbox] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
   <div class="issue">
 
     <div class="splitcontent">
@@ -12,12 +12,12 @@
         <div class="splitcontent">
           <div class="splitcontentleft">
             <h4><%=t(:field_customer)%>:</h4>
-            <%= render :partial => 'customers/details', locals: {customer: @customer} %>
+            <%= render partial: 'customers/details', locals: {customer: @customer} %>
           </div>
 
           <div class="splitcontentleft">
             <h4><%=t(:label_actions)%>:</h4>
-            <%= render :partial => 'customers/actions', locals: {customer: @customer} %>
+            <%= render partial: 'customers/actions', locals: {customer: @customer} %>
           </div>
         </div>
 
@@ -27,12 +27,12 @@
         <div class="splitcontent">
           <div class="splitcontentleft">
             <h4><%=t(:estimates)%>:</h4>
-            <%= render :partial => 'estimates/list', locals: {customer: @customer} %>
+            <%= render partial: 'estimates/list', locals: {customer: @customer} %>
           </div>
 
           <div class="splitcontentleft">
             <h4><%=t(:label_invoices)%>:</h4>
-            <%= render :partial => 'invoices/list', locals: {customer: @customer} %>
+            <%= render partial: 'invoices/list', locals: {customer: @customer} %>
           </div>
         </div>
 
@@ -47,7 +47,7 @@
 
 <br/>
 <h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>
 
 <h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%> - <%= @closed_hours.round(1)%> <%=t(:label_hours)%></h3>
-<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
+<%= render partial: 'issues/list_simple', locals: {issues: @closed_issues} %>

app/views/customers/view.html.erb

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

app/views/estimates/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag(estimate_doc_path, :method => "get") do %>
-    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), :autocomplete => "off" %>
-    <%= submit_tag t(:label_search), :formtarget => "_blank" %>
+<%= form_tag(estimate_doc_path, method: "get") do %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), autocomplete: "off" %>
+    <%= submit_tag t(:label_search), formtarget: "_blank" %>
 <% end %>

app/views/estimates/_sidebar.html.erb

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

app/views/issues/_history.html.erb

@@ -3,12 +3,12 @@
   <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
     <div id="note-<%= journal.indice %>">
     <div class="contextual">
-      <span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span>
+      <span class="journal-actions"><%= render_journal_actions(issue, journal, reply_links: reply_links) %></span>
       <a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>
     </div>
     <h4>
-      <%= avatar(journal.user, :size => "24") %>
-      <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
+      <%= avatar(journal.user, size: "24") %>
+      <%= authoring journal.created_on, journal.user, label: :label_updated_time_by %>
       <%= render_private_notes_indicator(journal) %>
     </h4>
 
@@ -26,10 +26,10 @@
       </div>
     <% end %>
     <% end %>
-    <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
+    <%= render_notes(issue, journal, reply_links: reply_links) unless journal.notes.blank? %>
     </div>
   </div>
-  <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
+  <%= call_hook(:view_issues_history_journal_bottom, { journal: journal }) %>
 <% end %>
 
 <% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>

app/views/issues/_list_simple.html.erb

@@ -9,9 +9,9 @@
     </tr></thead>
     <tbody>
     <% for issue in issues %>
-    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+    <tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle(:odd, :even) %> <%= issue.css_classes %>">
       <td class="id">
-        <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
+        <%= check_box_tag("ids[]", issue.id, false, style: 'display:none;', id: nil) %>
         <%= link_to(issue.id, issue_path(issue)) %>
       </td>
       <td class="project"><%= link_to_project(issue.project) %></td>

app/views/qbo/_settings.html.erb

@@ -60,7 +60,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     <tr>
       <th><%=t(:label_sandbox)%></th>
       <td>
-        <%= check_box_tag 'settings[sandbox]', @settings['sandbox'], @settings['sandbox'] %>
+        <%= check_box_tag 'settings[sandbox]', @settings[:sandbox], @settings[:sandbox] %>
       </td>
     </tr>
 

app/views/qbo/_sidebar.html.erb

@@ -1,6 +1,6 @@
 <% if User.current.logged? %>
 
-    <%= render :partial => 'customers/sidebar' %>
-    <%= render :partial => 'estimates/sidebar' %>
+    <%= render partial: 'customers/sidebar' %>
+    <%= render partial: 'estimates/sidebar' %>
 
 <% end %>

app/views/qbo/_stats.html.erb

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

config/locales/en.yml

@@ -12,7 +12,6 @@
 # Usage I18n.t(:label)
 en:
   field_customer: "Customer"
-  field_item: "Item"
   field_employee: "Employee"
   field_invoice: "Invoice"
   field_estimate: "Estimate" 
@@ -54,7 +53,6 @@ en:
   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"
@@ -87,4 +85,18 @@ en:
   label_syncing: "Syncing Quickbooks"
   label_sandbox: "Sandbox"
   button_bulk_pdf: "Bulk PDF"
-  label_select_all: "Select All"
+  label_select_all: "Select All"
+  notice_customer_created: "Customer created in Quickbooks"
+  notice_customer_updated: "Customer updated in Quickbooks"
+  notice_customer_not_found: "Customer not found in Quickbooks"
+  notice_customer_not_deleted: "Customer could not be deleted in Quickbooks"
+  notice_customer_deleted: "Customer deleted in Quickbooks"
+  notice_estimate_created: "Estimate created in Quickbooks"
+  notice_estimate_updated: "Estimate updated in Quickbooks"
+  notice_estimate_not_found: "Estimate not found"
+  notice_invoice_created: "Invoice created in Quickbooks"
+  notice_invoice_updated: "Invoice updated in Quickbooks"
+  notice_invoice_not_found: "Invoice not found"
+  notice_forbidden: "You do not have permission to access this resource"
+  notice_issue_not_found: "Issue not found"
+  customer_details: "Customer Details"

config/routes.rb

@@ -9,31 +9,31 @@
 #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.
 
 #authentication
-get 'qbo/authenticate', :to => 'qbo#authenticate'
-get 'qbo/oauth_callback', :to => 'qbo#oauth_callback'
+get 'qbo/authenticate', to: 'qbo#authenticate'
+get 'qbo/oauth_callback', to: 'qbo#oauth_callback'
 
 #manual sync
-get 'qbo/sync', :to => 'qbo#sync'
+get 'qbo/sync', to: 'qbo#sync'
 
 #webhook
-post 'qbo/webhook', :to => 'qbo#webhook'
+post 'qbo/webhook', to: 'qbo#webhook'
 
 # Estimate & Invoice PDF
-get 'estimates/:id', :to => 'estimate#show', as: :estimate
-get 'estimates/doc/', :to => 'estimate#doc', as: :estimate_doc
-get 'invoices/:id', :to => 'invoice#show', as: :invoice
+get 'estimates/:id', to: 'estimate#show', as: :estimate
+get 'estimates/doc/', to: 'estimate#doc', as: :estimate_doc
+get 'invoices/:id', to: 'invoice#show', as: :invoice
 
 #manual billing
-get 'bill/:id', :to => 'qbo#bill', as: :bill
+get 'bill/:id', to: 'qbo#bill', as: :bill
 
 #customer issue view
-get 'customers/view/:token', :to => 'customers#view', as: :view
-get 'customers/share/:id', :to => 'customers#share', as: :share
+get 'customers/view/:token', to: 'customers#view', as: :view
+get 'customers/share/:id', to: 'customers#share', as: :share
 
 #java script routes
 get 'filter_estimates_by_customer' => 'customers#filter_estimates_by_customer'
 get 'filter_invoices_by_customer' => 'customers#filter_invoices_by_customer'
 
 resources :customers do
-  get :autocomplete_customer_name, :on => :collection
+  get :autocomplete_customer_name, on: :collection
 end

db/migrate/002_create_qbo_customers.rb

@@ -11,7 +11,7 @@
 class CreateQboCustomers < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_customers, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/004_create_qbo_items.rb

@@ -11,7 +11,7 @@
 class CreateQboItems < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_items, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/005_create_qbo_employees.rb

@@ -11,7 +11,7 @@
 class CreateQboEmployees < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_employees, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :name
     end
   end

db/migrate/007_update_time_entries.rb

@@ -10,6 +10,6 @@
 
 class UpdateTimeEntries < ActiveRecord::Migration[5.1]
   def change
-    add_column :time_entries, :qbo_billed, :boolean, :default => false
+    add_column :time_entries, :qbo_billed, :boolean, default: false
   end
 end

db/migrate/008_create_qbo_estimates.rb

@@ -11,7 +11,7 @@
 class CreateQboEstimates < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_estimates, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :doc_number
     end
   end

db/migrate/011_create_qbo_invoices.rb

@@ -11,7 +11,7 @@
 class CreateQboInvoices < ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_invoices, id: false do |t|
-      t.integer :id, :options => 'PRIMARY KEY'
+      t.integer :id, options: 'PRIMARY KEY'
       t.string :doc_number
     end
   end

db/migrate/013_create_qbo_purchases.rb

@@ -11,7 +11,7 @@
 class CreateQboPurchases< ActiveRecord::Migration[5.1]
   def change
     create_table :qbo_purchases, id: false do |t| 
-      t.integer :id, :options => 'PRIMARY KEY' 
+      t.integer :id, options: 'PRIMARY KEY' 
       t.integer :line_id
       t.string :description
       t.integer :customer_id

db/migrate/021_add_issues_qbo_invoices.rb

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

db/migrate/032_add_txn_dates.rb

@@ -30,7 +30,7 @@ class AddTxnDates < ActiveRecord::Migration[5.1]
 
           qbo = Qbo.first
           invoices = qbo.perform_authenticated_request do |access_token|
-            service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
+            service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
             service.all
           end
 

init.rb

@@ -11,32 +11,31 @@
 Redmine::Plugin.register :redmine_qbo do
   
   # About
-  name 'Redmine QBO DEVELOPMENT plugin'
+  name 'Redmine QBO 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 '2026.1.2'
+  version '2026.1.8'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
-  settings :default => {'empty' => true}, :partial => 'qbo/settings'
-  requires_redmine :version_or_higher => '6.1.0'
+  settings default: {empty: true}, partial: 'qbo/settings'
+  requires_redmine version_or_higher: '6.1.0'
   
   # Add safe attributes for core models
-  Issue.safe_attributes 'customer_id'
-  Issue.safe_attributes 'item_id'
-  Issue.safe_attributes 'estimate_id'
-  Issue.safe_attributes 'invoice_id'
-  User.safe_attributes 'employee_id'
-  TimeEntry.safe_attributes 'billed'
+  Issue.safe_attributes :customer_id
+  Issue.safe_attributes :estimate_id
+  Issue.safe_attributes :invoice_id
+  User.safe_attributes :employee_id
+  TimeEntry.safe_attributes :billed
   
   # 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_customers, customers: :index, public: false
+  permission :add_customers, customers: :new, public: false
   
   # Register top menu items
-  menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
+  menu :top_menu, :customers, { controller: :customers, action: :index }, caption: :label_customers, if: Proc.new {User.current.logged?}
     
 end
 

lib/hooks/issues_form_hook_listener.rb

@@ -20,44 +20,31 @@ module Hooks
       f = context[:form]
       issue = context[:issue]
 
-      # Check to see if the issue already belongs to a customer
-      selected_customer = issue.customer ? issue.customer.id  : nil
-      selected_estimate = issue.estimate ? issue.estimate.id  : nil
-      
-      # Gernerate edit.js link
-      js_link = "updateIssueFrom('#{escape_javascript update_issue_form_path(issue.project, issue)}', this)"
-
-      # Load customer information
-      customer = Customer.find_by_id(selected_customer) if selected_customer
-
       # Customer Name Text Box with database backed autocomplete
+      # onchange event will update the hidden customer_id field
       search_customer = f.autocomplete_field :customer,
         autocomplete_customer_name_customers_path,
-        :selected => selected_customer,
-        :onchange => js_link,
-        :update_elements => { 
-          :id => '#issue_customer_id', 
-          :value => '#issue_customer' 
+        selected: issue.customer,
+        update_elements: { 
+          id: '#issue_customer_id', 
+          value: '#issue_customer' 
         }
 
-      # Customer ID - Hidden Field
+      # This hidden field is used for the customer ID for the issue
+      # the onchange event will reload the issue form via ajax to update the available estimates
       customer_id = f.hidden_field :customer_id,
-        :id => "issue_customer_id",
-        :onchange => js_link
+        id: "issue_customer_id",
+        onchange: "updateIssueFrom('#{escape_javascript update_issue_form_path(issue.project, issue)}', this)".html_safe
 
-      # Load estimates
-      if issue.customer
-        estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
-      else
-        estimates = [nil].compact
-      end
-
-      # Generate the drop down list of quickbooks estimates
-      select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
+      # Generate the drop down list of quickbooks estimates owned by the selected customer
+      select_estimate = f.select :estimate_id, 
+        issue.customer ? issue.customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x} : [], 
+        selected: issue.estimate ? issue.estimate.id : nil, 
+        include_blank: true
       
       # Pass all prebuilt form components to our partial
       context[:controller].send(:render_to_string, {
-        :partial => 'issues/form_hook',
+        partial: 'issues/form_hook',
           locals: {
             search_customer: search_customer, 
             customer_id: customer_id, 

lib/hooks/issues_save_hook_listener.rb

@@ -14,8 +14,11 @@ module Hooks
 
     # Called Before Issue Saved
     def controller_issues_edit_before_save(context={})
-      issue = context[:issue]
-      issue.subject = issue.subject.titleize
+      return context[:issue].subject = context[:issue].subject.titleize
+    end
+
+    def controller_issues_new_before_save(context={})
+      return context[:issue].subject = context[:issue].subject.titleize
     end
 
     # Called After Issue Saved

lib/hooks/issues_show_hook_listener.rb

@@ -13,37 +13,24 @@ module Hooks
   class IssuesShowHookListener < Redmine::Hook::ViewListener
 
     # View Issue
-    # Display the quickbooks contact in the issue
+    # Displays the quickbooks customer, estimate, & invoices attached to the issue
     def view_issues_show_details_bottom(context={})
       issue = context[:issue]
       
-      # Check to see if there is a quickbooks user attached to the issue
-      if issue.customer
-        customer = link_to issue.customer.name, customer_path( issue.customer.id )
-      end
-      
-      # Estimate Number
-      if issue.estimate
-        estimate = issue.estimate.doc_number
-        estimate_link = link_to estimate, estimate_path( issue.estimate.id ), :target => "_blank"
-      end
-      
-      # Invoice Number
+      # Build a list of invoice links
       invoice_link = ""
-      if issue.invoice_ids
-        issue.invoice_ids.each do |i|
-          invoice = Invoice.find i
-          invoice_link = invoice_link + link_to( invoice.doc_number, invoice_path( i ), :target => "_blank").to_s + " "
-          invoice_link = invoice_link.html_safe
+      if issue.invoices
+        issue.invoices.each do |i|
+          invoice_link += "#{link_to i, i, target: :_blank}<br/>"
         end
       end
       
       context[:controller].send(:render_to_string, {
-        :partial => 'issues/show_details',
+        partial: 'issues/show_details',
           locals: {
-            customer: customer, 
-            estimate_link: estimate_link, 
-            invoice_link: invoice_link,
+            customer: issue.customer ? link_to(issue.customer) : nil, 
+            estimate_link: issue.estimate ? link_to(issue.estimate, issue.estimate, target: :_blank) : nil, 
+            invoice_link: invoice_link.html_safe,
             issue: issue
           } 
         })

lib/hooks/users_show_hook_listener.rb

@@ -22,7 +22,7 @@ module Hooks
       @selected = context[:user].employee.id if context[:user].employee
 
       # Generate the drop down list of quickbooks contacts
-      return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}</p>"
+      return "<p>#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), selected: @selected, include_blank: true}</p>"
     end
   end
 

lib/hooks/view_hook_listener.rb

@@ -12,7 +12,7 @@ module Hooks
 
   class ViewHookListener < Redmine::Hook::ViewListener
 
-    render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
+    render_on :view_layouts_base_sidebar, partial: "qbo/sidebar"
     
   end
 

lib/hooks/view_layouts_hook_listener.rb

@@ -14,9 +14,9 @@ module Hooks
 
     # Load the javascript to support the autocomplete forms
     def view_layouts_base_html_head(context = {})
-      js = javascript_include_tag 'application.js', :plugin => 'redmine_qbo'
-      js += javascript_include_tag 'autocomplete-rails.js', :plugin => 'redmine_qbo'
-      js += javascript_include_tag 'checkbox_controller.js', :plugin => 'redmine_qbo'
+      js = javascript_include_tag 'application.js', plugin: :redmine_qbo
+      js += javascript_include_tag 'autocomplete-rails.js', plugin: :redmine_qbo
+      js += javascript_include_tag 'checkbox_controller.js', plugin: :redmine_qbo
       return js
     end
 

lib/patches/issue_patch.rb

@@ -55,8 +55,8 @@ module Patches
           # Prepare to create a new Time Activity
           qbo = Qbo.first
           qbo.perform_authenticated_request do |access_token|
-            time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token)
-            item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token)
+            time_service = Quickbooks::Service::TimeActivity.new(company_id: qbo.realm_id, access_token: access_token)
+            item_service = Quickbooks::Service::Item.new(company_id: qbo.realm_id, access_token: access_token)
             time_entry = Quickbooks::Model::TimeActivity.new
     
             # Lets total up each activity before billing.

lib/patches/pdf_patch.rb

@@ -54,9 +54,9 @@ module Patches
         left << [l(:field_status), issue.status]
         left << [l(:field_priority), issue.priority]
         left << [l(:field_customer), customer]
-        left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
-        #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id')
-        #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
+        left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?(:assigned_to_id)
+        #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?(:category_id)
+        #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?(:fixed_version_id)
         
         logger.debug "Calling :pdf_left hook"
         left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
@@ -67,10 +67,10 @@ module Patches
         end
 
         right = []
-        right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
-        right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date')
-        right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
-        right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
+        right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?(:start_date)
+        right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?(:due_date)
+        right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?(:done_ratio)
+        right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?(:estimated_hours)
         right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
         
         logger.debug "Calling :pdf_right hook"
@@ -143,10 +143,10 @@ module Patches
         # Set resize image scale
         pdf.set_image_scale(1.6)
         text = textilizable(issue, :description,
-                            :only_path => false,
-                            :edit_section_links => false,
-                            :headings => false,
-                            :inline_attachments => false
+                            only_path: false,
+                            edit_section_links: false,
+                            headings: false,
+                            inline_attachments: false
         )
         pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
 
@@ -233,10 +233,10 @@ module Patches
               pdf.ln unless journal.details.empty?
               pdf.SetFontStyle('',8)
               text = textilizable(journal, :notes,
-                                  :only_path => false,
-                                  :edit_section_links => false,
-                                  :headings => false,
-                                  :inline_attachments => false
+                                  only_path: false,
+                                  edit_section_links: false,
+                                  headings: false,
+                                  inline_attachments: false
               )
               pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
             end

lib/patches/query_patch.rb

@@ -18,15 +18,15 @@ module Patches
     def available_columns
       unless @available_columns
         @available_columns = self.class.available_columns.dup
-        @available_columns << QueryColumn.new(:customer, :sortable => "#{Issue.table_name}.customer_id", :groupable => true, :caption => :field_customer)
-        @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.billed", :groupable => true, :caption => :field_billed)
+        @available_columns << QueryColumn.new(:customer, sortable: "#{Issue.table_name}.customer_id", groupable: true, caption: :field_customer)
+        @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.billed", groupable: true, caption: :field_billed)
       end
       super
     end
     
     # Add customers to filters
     def initialize_available_filters
-      #add_available_filter "customer", :type => :text
+      #add_available_filter "customer", type: :text
       super
     end
 

lib/patches/time_entry_query_patch.rb

@@ -18,14 +18,14 @@ module Patches
     def available_columns
       unless @available_columns
         @available_columns = self.class.available_columns.dup
-        @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_billed)
+        @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.name", groupable: true, caption: :field_billed)
       end
       super
     end
     
     # Add QBO options to the filter
     def initialize_available_filters
-      add_available_filter "billed", :type => :boolean
+      add_available_filter "billed", type: :boolean
       super
     end
 

test/functional/estimate_controller_test.rb

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

test/functional/invoice_controller_test.rb

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

test/functional/qbo_controller_test.rb

@@ -1,18 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 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 File.expand_path('../../test_helper', __FILE__)
-
-class QboControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

test/test_helper.rb

@@ -1,2 +0,0 @@
-# Load the Redmine helper
-require File.expand_path(File.dirname(__FILE__) + '/../../../test/test_helper')

test/unit/customer_token_test.rb

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

test/unit/qbo_customers_test.rb

@@ -1,19 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 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 File.expand_path('../../test_helper', __FILE__)
-
-class QboCustomersTest < ActiveSupport::TestCase
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

test/unit/qbo_employee_test.rb

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

test/unit/qbo_item_test.rb

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

test/unit/qbo_test.rb

@@ -1,19 +0,0 @@
-#The MIT License (MIT)
-#
-#Copyright (c) 2016 - 2026 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 File.expand_path('../../test_helper', __FILE__)
-
-class QboTest < ActiveSupport::TestCase
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end