Compare commits

...

48 Commits

Author SHA1 Message Date
ff358d806e 2026.1.5 2026-01-30 07:22:11 -05:00
b80e1d4e28 loose the hash rocket, use symbol keys 2026-01-29 22:30:59 -05:00
f24128ef75 Cleaned up Issue Show Hook 2026-01-29 21:53:18 -05:00
d3a8c05f50 Added missing to_s method 2026-01-29 21:36:50 -05:00
f023cd246d Titlize new issue subjects 2026-01-29 21:18:15 -05:00
b7e18a3c3f Cleaned up Issue Form Hook 2026-01-29 21:12:32 -05:00
67f2dbf4d8 Removed reduntant onchange js call to update issue 2026-01-28 17:35:12 -05:00
924aa7657b Fixed typo 2026-01-28 10:11:28 -05:00
16fe07f177 Fixed typo 2026-01-28 08:50:37 -05:00
9257b2f938 2026.1.4 2026-01-28 08:42:33 -05:00
0227681e92 Added hook list to README 2026-01-28 08:41:55 -05:00
c034696810 Disabled showing assinee to customer 2026-01-28 08:38:02 -05:00
ffdabccd84 Updated README with information about plugin hooks 2026-01-28 08:18:29 -05:00
1f03908040 Refactor employee and estimate models by removing redundant comments; update locale file to remove item references; delete unused QboItemTest file. 2026-01-28 07:45:20 -05:00
43a5317b4e Removed DEVELOPMENT from plugin name 2026-01-28 07:03:08 -05:00
4c49ec6890 2026.1.3 2026-01-27 21:17:17 -05:00
ef7faee685 Process updates from the hooks 2026-01-27 20:50:54 -05:00
02b48d2de4 Dont add reference for customers to projects 2026-01-27 18:07:37 -05:00
e670d99766 Removed project level intergration 2026-01-27 18:01:42 -05:00
241dd594d0 Fixed pdf hooks 2026-01-26 23:22:23 -05:00
b603cb634a Version Bump 2026.1.2 2026-01-26 22:59:48 -05:00
1308a05011 Removed Load Customer Link 2026-01-26 21:00:16 -05:00
334ed60bf7 removed extra comma 2026-01-26 20:14:01 -05:00
d63bf809f2 Merge branch 'redmine-6' into dev-6 2026-01-26 10:16:40 -05:00
4ae9374401 Merge branch 'redmine-6' into dev-6 2026-01-22 21:50:40 -05:00
2f2c74403f Bug fixes 2026-01-22 21:20:47 -05:00
43579d73e5 Merge remote-tracking branch 'origin/hooks' into dev-6 2026-01-22 20:58:06 -05:00
a90d6b839f Updated readme 2026-01-22 20:57:09 -05:00
e76f977ca8 Removed Vehicles 2026-01-22 20:54:06 -05:00
7f821d241c Removed typo 2026-01-22 20:47:31 -05:00
1bc9227c7f finish redmine-6 merge into dev 2026-01-22 20:43:06 -05:00
3c2f1d0edd Merge branch 'redmine-6' into HEAD 2026-01-22 20:39:20 -05:00
f0a3b0193c Development mode
Use the QBO sandbox & Display DEVEOMPENT in the plugin name
2025-06-18 08:30:21 -04:00
b531076c18 Merge branch 'dev' into hooks 2023-12-30 23:43:10 -05:00
9e342ced28 Merge branch 'master' into hooks 2023-12-30 23:40:08 -05:00
0537d9bd86 Merge branch 'master' into hooks 2023-12-30 23:18:55 -05:00
a531ef4f87 Added hour totals to customer job history 2023-01-14 06:20:41 -05:00
1fae647381 Merge branch 'master' into dev 2022-03-19 05:49:54 -04:00
d1764e2203 Removed Comment 2022-03-19 05:49:18 -04:00
f830881883 Don't need to pass customer, only issue 2022-03-17 06:52:46 -04:00
fb87e8a33a Added hook :show_issue_view_right 2022-03-17 06:45:57 -04:00
8bdec410c4 Fixed render of hook :show_customer_view_right 2022-03-17 06:12:35 -04:00
dec9eee90b Merge branch 'master' into dev 2022-03-15 12:29:11 -04:00
2745ecf242 Added call_hook :show_customer_view_right 2022-03-14 07:52:33 -04:00
13472c3b3a Remove nhtsa_vin gem 2022-03-14 07:26:07 -04:00
b686110145 Initial Vehicle Delete 2022-03-14 07:22:43 -04:00
d91e7892c3 Added PDF hooks 2022-03-13 22:36:34 -04:00
f26224de56 Created hook process_invoice_custom_fields 2022-03-13 20:06:13 -04:00
72 changed files with 254 additions and 959 deletions

View File

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
gem 'quickbooks-ruby' gem 'quickbooks-ruby'
gem 'oauth2' gem 'oauth2'
gem 'roxml' gem 'roxml'
gem 'nhtsa_vin'
gem 'will_paginate' gem 'will_paginate'
gem 'rails-jquery-autocomplete' gem 'rails-jquery-autocomplete'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'

View File

@@ -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`). * **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). * **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. * **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 ## Prerequisites
@@ -90,13 +91,11 @@ To enable automatic Time Activity entries for an Issue, you simply need to assig
**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 ## Companion Plugin Hooks
* :pdf_left, { issue: issue }
* Separate Vehicles into a separate plugin (I use Redmine for my automotive shop management 😉) * :pdf_right, { issue: issue }
* Checkout branch dev-6 for a stripped down version * :process_invoice_custom_fields, { issue: issue, invoice: invoice }
* :show_customer_view_right, {customer: @customer}
* MORE Stuff as I make it up...
## License ## License

View File

@@ -26,24 +26,18 @@ class CustomersController < ApplicationController
include SortHelper include SortHelper
helper :timelog helper :timelog
before_action :add_customer, :only => :new before_action :add_customer, only: :new
before_action :view_customer, :except => [:new, :view] before_action :view_customer, except: [:new, :view]
skip_before_action :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 default_search_scope :names
autocomplete :customer, :name, :full => true, :extra_data => [:id] autocomplete :customer, :name, full: true, extra_data: [:id]
def allowed_params def allowed_params
params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes) params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
end 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 # getter method for a customer's invoices
# used for customer autocomplete field / issue form # used for customer autocomplete field / issue form
def filter_invoices_by_customer def filter_invoices_by_customer
@@ -59,7 +53,7 @@ class CustomersController < ApplicationController
# display a list of all customers # display a list of all customers
def index def index
if params[:search] 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) if only_one_non_zero?(@customers)
redirect_to @customers.first redirect_to @customers.first
end end
@@ -87,7 +81,6 @@ class CustomersController < ApplicationController
def show def show
begin begin
@customer = Customer.find_by_id(params[:id]) @customer = Customer.find_by_id(params[:id])
@vehicles = @customer.vehicles.paginate(:page => params[:page])
@issues = @customer.issues.order(id: :desc) @issues = @customer.issues.order(id: :desc)
@billing_address = address_to_s(@customer.billing_address) @billing_address = address_to_s(@customer.billing_address)
@shipping_address = address_to_s(@customer.shipping_address) @shipping_address = address_to_s(@customer.shipping_address)
@@ -168,7 +161,7 @@ class CustomersController < ApplicationController
@issue = Issue.find @token.issue_id @issue = Issue.find @token.issue_id
@journals = @issue.journals. @journals = @issue.journals.
preload(:details). preload(:details).
preload(:user => :email_address). preload(user: :email_address).
reorder(:created_on, :id).to_a reorder(:created_on, :id).to_a
@journals.each_with_index {|j,i| j.indice = i+1} @journals.each_with_index {|j,i| j.indice = i+1}
@journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
@@ -182,7 +175,7 @@ class CustomersController < ApplicationController
@relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
@allowed_statuses = @issue.new_statuses_allowed_to(User.current) @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@priorities = IssuePriority.active @priorities = IssuePriority.active
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) @time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
@relation = IssueRelation.new @relation = IssueRelation.new
rescue rescue
render_403 render_403

View File

@@ -11,8 +11,8 @@ class EstimateController < ApplicationController
include AuthHelper include AuthHelper
before_action :require_user, :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? } skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
def get_estimate def get_estimate
# Force sync for estimate by doc number if not found # Force sync for estimate by doc number if not found
@@ -36,9 +36,9 @@ class EstimateController < ApplicationController
estimate = get_estimate estimate = get_estimate
begin 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 rescue
redirect_to :back, :flash => { :error => "Estimate not found" } redirect_to :back, flash: { error: "Estimate not found" }
end end
end end
@@ -49,9 +49,9 @@ class EstimateController < ApplicationController
estimate = get_estimate estimate = get_estimate
begin 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 rescue
redirect_to :back, :flash => { :error => "Estimate not found" } redirect_to :back, flash: { error: "Estimate not found" }
end end
end end

View File

@@ -12,8 +12,8 @@ class InvoiceController < ApplicationController
include AuthHelper include AuthHelper
require 'combine_pdf' require 'combine_pdf'
before_action :require_user, :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? } skip_before_action :verify_authenticity_token, :check_if_login_required, unless: proc {|c| session[:token].nil? }
# #
# Downloads and forwards the invoice pdf # Downloads and forwards the invoice pdf
@@ -23,7 +23,7 @@ class InvoiceController < ApplicationController
begin begin
qbo = Qbo.first qbo = Qbo.first
qbo.perform_authenticated_request do |access_token| 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 multiple id's then pull each pdf & combine them
if params[:invoice_ids] if params[:invoice_ids]
@@ -45,10 +45,10 @@ class InvoiceController < ApplicationController
ref = invoice.doc_number ref = invoice.doc_number
end 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 end
rescue rescue
redirect_to :back, :flash => { :error => "Invoice not found" } redirect_to :back, flash: { error: "Invoice not found" }
end end
end end
end end

View File

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

View File

@@ -1,125 +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.
# This controller class will handle map management
class VehiclesController < ApplicationController
include AuthHelper
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]
begin
@vehicles = Customer.find_by_id(params[:customer_id]).vehicles.paginate(:page => params[:page])
rescue ActiveRecord::RecordNotFound
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)
redirect_to @vehicles.first
end
end
end
# return an HTML form for creating a new vehicle
def new
@vehicle = Vehicle.new
@customer = Customer.find_by_id(params[:customer_id]) if params[:customer_id]
end
# create a new vehicle
def create
@vehicle = Vehicle.new(allowed_params)
if @vehicle.save
flash[:notice] = "New Vehicle Created"
redirect_to @vehicle
else
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
@vehicle = Vehicle.find_by_id(params[:id])
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
@issues = @vehicle.issues.order(id: :desc)
@closed_issues = (@issues - @issues.open)
rescue
render_404
end
end
# return an HTML form for editing a vehicle
def edit
begin
@vehicle = Vehicle.find_by_id(params[:id])
@customer = @vehicle.customer
rescue
render_404
end
end
# update a specific vehicle
def update
@customer = params[:customer]
begin
@vehicle = Vehicle.find_by_id(params[:id])
if @vehicle.update(allowed_params)
flash[:notice] = "Vehicle updated"
redirect_to @vehicle
else
redirect_to edit_vehicle_path
end
#show any errors anyways
flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
rescue
render_404
end
end
# delete a specific vehicle
def destroy
begin
Vehicle.find_by_id(params[:id]).destroy
flash[:notice] = "Vehicle deleted successfully"
redirect_to action: :index
rescue
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|
if val!=0
return false if found_non_zero
found_non_zero = true
end
end
found_non_zero
end
end

View File

@@ -13,7 +13,6 @@ class Customer < ActiveRecord::Base
has_many :issues has_many :issues
has_many :invoices has_many :invoices
has_many :estimates has_many :estimates
has_many :vehicles
validates_presence_of :id, :name validates_presence_of :id, :name
@@ -143,7 +142,7 @@ class Customer < ActiveRecord::Base
# Sync ALL customers if the database is empty # Sync ALL customers if the database is empty
qbo = Qbo.first qbo = Qbo.first
customers = qbo.perform_authenticated_request do |access_token| 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 service.all
end end
@@ -179,7 +178,7 @@ class Customer < ActiveRecord::Base
def self.sync_by_id(id) def self.sync_by_id(id)
qbo = Qbo.first qbo = Qbo.first
c = qbo.perform_authenticated_request do |access_token| 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) service.fetch_by_id(id)
end end
@@ -206,7 +205,7 @@ class Customer < ActiveRecord::Base
begin begin
qbo = Qbo.first qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token| @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) service.update(@details)
end end
#raise "QBO Fault" if @details.fault? #raise "QBO Fault" if @details.fault?
@@ -228,7 +227,7 @@ class Customer < ActiveRecord::Base
raise Exception unless self.id raise Exception unless self.id
qbo = Qbo.first qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token| @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) service.fetch_by_id(self.id)
end end
rescue Exception => e rescue Exception => e

View File

@@ -55,7 +55,7 @@ class CustomerToken < ActiveRecord::Base
end end
# only create new token if we have an issue to attach it to # 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
end end

View File

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

View File

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

View File

@@ -15,6 +15,11 @@ class Invoice < ActiveRecord::Base
validates_presence_of :doc_number, :id, :customer_id, :txn_date validates_presence_of :doc_number, :id, :customer_id, :txn_date
self.primary_key = :id self.primary_key = :id
# returns a human readable string
def to_s
return self[:doc_number]
end
# sync ALL the invoices # sync ALL the invoices
def self.sync def self.sync
logger.info "Syncing all invoices" logger.info "Syncing all invoices"
@@ -27,7 +32,7 @@ class Invoice < ActiveRecord::Base
# .all() is never called since count is never initialized # .all() is never called since count is never initialized
qbo = Qbo.first qbo = Qbo.first
invoices = qbo.perform_authenticated_request do |access_token| 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 service.all
end end
@@ -43,7 +48,7 @@ class Invoice < ActiveRecord::Base
logger.info "Syncing invoice #{id}" logger.info "Syncing invoice #{id}"
qbo = Qbo.first qbo = Qbo.first
qbo.perform_authenticated_request do |access_token| 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) invoice = service.fetch_by_id(id)
process_invoice invoice process_invoice invoice
end end
@@ -109,33 +114,18 @@ class Invoice < ActiveRecord::Base
# TODO break if Invoice.find(invoice.id).cf_sync_confict # TODO break if Invoice.find(invoice.id).cf_sync_confict
is_changed = false is_changed = false
# update the invoive custom fields with infomation from the issue if available logger.debug "Calling :process_invoice_custom_fields hook"
invoice.custom_fields.each { |cf| context = Redmine::Hook.call_hook :process_invoice_custom_fields, { issue: issue, invoice: invoice }
# VIN from the attached vehicle # Process updates from the hooks
# TODO move this into seperate plugin context.each do |c|
# TODO create hook for seperate plugin unless c.nil?
begin logger.debug "Invoice.compare_custom_fields: We have a responce from a hook"
if cf.name.eql? "VIN" push_updates c[:invoice] if c[:is_changed]
# Only update if blank to prevent infite loops end
# TODO check cf_sync_confict flag once implemented
if cf.string_value.to_s.blank?
logger.info " VIN was blank, updating the invoice vin in quickbooks"
vin = Vehicle.find(issue.vehicles_id).vin
break if vin.nil?
if not cf.string_value.to_s.eql? vin
cf.string_value = vin.to_s
logger.info "VIN has changed"
is_changed = true
end end
end # Process Issue Custom Values
end
rescue
#do nothing
end
# Custom Values
begin begin
value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id) value = issue.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
@@ -151,15 +141,18 @@ class Invoice < ActiveRecord::Base
rescue rescue
# Nothing to do here, there is no match # Nothing to do here, there is no match
end end
}
# Push updates push_updates invoice if is_changed
end
# pushes invoice updates
def self.push_updates(invoice)
begin begin
logger.info "Trying to update invoice" logger.info "Invoice.push_updates"
qbo = Qbo.first qbo = Qbo.first
qbo.perform_authenticated_request do |access_token| 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) if is_changed service.update invoice
end end
rescue rescue
# Do nothing, probaly custome field sync confict on the invoice. # Do nothing, probaly custome field sync confict on the invoice.
@@ -174,7 +167,7 @@ class Invoice < ActiveRecord::Base
def pdf def pdf
qbo = Qbo.first qbo = Qbo.first
qbo.perform_authenticated_request do |access_token| 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) invoice = service.fetch_by_id(id)
return service.pdf(invoice) return service.pdf(invoice)
end end
@@ -204,7 +197,7 @@ class Invoice < ActiveRecord::Base
raise Exception unless self.id raise Exception unless self.id
qbo = Qbo.first qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token| @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) service.fetch_by_id(self.id)
end end
rescue Exception => e rescue Exception => e

View File

@@ -1,98 +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.
class Vehicle < ActiveRecord::Base
belongs_to :customer
has_many :issues, :foreign_key => 'vehicles_id'
validates_presence_of :customer
validates :vin, uniqueness: true
before_save :decode_vin
self.primary_key = :id
# returns a human readable string
def to_s
if year.nil? or make.nil? or model.nil?
return "#{vin}"
else
split_vin = vin.scan(/.{1,9}/)
return "#{year} #{make} #{model} - #{split_vin[1]}"
end
end
# returns the raw JSON details from NHTSA
def details
get_details if @details.nil?
return @details
end
# Force Upper Case for make numbers
def make=(val)
# The to_s is in case you get nil/non-string
write_attribute(:make, val.to_s.titleize)
end
# Force Upper Case for model numbers
def model=(val)
# The to_s is in case you get nil/non-string
write_attribute(:model, val.to_s.titleize)
end
# Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
def vin=(val)
val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
write_attribute(:vin, val)
end
# search for a vin
def self.search(search)
where("vin LIKE ?", "%#{search}%")
end
# decodes a vin and updates self
def decode_vin
get_details
if @details
begin
self.year = @details.year unless @details.year.nil?
self.make = @details.make unless @details.make.nil?
self.model = @details.model unless @details.model.nil?
self.doors = @details.doors unless @details.doors.nil?
self.trim = @details.trim unless @details.trim.nil?
rescue Exception => e
errors.add(:vin, e.message)
end
end
self.name = to_s
end
private
# init method to pull JSON details from NHTSA
def get_details
if self.vin?
#validate the vin before calling a remote server
validation = NhtsaVin.validate(self.vin)
begin
#if the vin validation failed, raise an exception and exit
raise RuntimeError, validation.error unless validation.valid?
# query NHTSA for details on the vin
query = NhtsaVin.get(self.vin)
raise RuntimeError, query.error unless query.valid?
@details = query.response
rescue Exception => e
errors.add(:vin, e.message)
end
end
end
end

View File

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

View File

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

View File

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

View File

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

View File

@@ -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) %>');

View File

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

View File

@@ -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? %> <% if @customers.present? %>
<br/> <br/>
<% @customers.each do |c| %> <% @customers.each do |c| %>
@@ -20,5 +20,5 @@
<% end %> <% end %>
<div> <div>
<%= render :partial => 'qbo/stats' %> <%= render partial: 'qbo/stats' %>
</div> </div>

View File

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

View File

@@ -12,12 +12,12 @@
<div class="splitcontent"> <div class="splitcontent">
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:field_customer)%>:</h4> <h4><%=t(:field_customer)%>:</h4>
<%= render :partial => 'customers/details', locals: {customer: @customer} %> <%= render partial: 'customers/details', locals: {customer: @customer} %>
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:label_actions)%>:</h4> <h4><%=t(:label_actions)%>:</h4>
<%= render :partial => 'customers/actions', locals: {customer: @customer} %> <%= render partial: 'customers/actions', locals: {customer: @customer} %>
</div> </div>
</div> </div>
@@ -27,23 +27,19 @@
<div class="splitcontent"> <div class="splitcontent">
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:estimates)%>:</h4> <h4><%=t(:estimates)%>:</h4>
<%= render :partial => 'estimates/list', locals: {customer: @customer} %> <%= render partial: 'estimates/list', locals: {customer: @customer} %>
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:label_invoices)%>:</h4> <h4><%=t(:label_invoices)%>:</h4>
<%= render :partial => 'invoices/list', locals: {customer: @customer} %> <%= render partial: 'invoices/list', locals: {customer: @customer} %>
</div> </div>
</div> </div>
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:field_vehicles)%>:</h4> <%= call_hook :show_customer_view_right, {customer: @customer} %>
<%= render :partial => 'vehicles/list' %>
<div style="float: right;">
<%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
</div>
</div> </div>
</div> </div>
@@ -51,7 +47,7 @@
<br/> <br/>
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3> <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> <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} %>

View File

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

View File

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

View File

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

View File

@@ -2,13 +2,8 @@
<label for="issue_customer"><%= t(:customer) %></label> <label for="issue_customer"><%= t(:customer) %></label>
<%= search_customer %> <%= search_customer %>
<%= customer_id %> <%= customer_id %>
<%= link_to t(:label_load_customer), '#', onclick: "#{js_link}; return false;" %>
</p> </p>
<p> <p>
<%= select_estimate %> <%= select_estimate %>
</p> </p>
<p>
<%= vehicle %>
</p>

View File

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

View File

@@ -11,7 +11,7 @@
<% for issue in issues %> <% 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"> <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)) %> <%= link_to(issue.id, issue_path(issue)) %>
</td> </td>
<td class="project"><%= link_to_project(issue.project) %></td> <td class="project"><%= link_to_project(issue.project) %></td>

View File

@@ -17,23 +17,6 @@
</div> </div>
<div class="splitcontentleft"> <div class="splitcontentleft">
<div class="vehicle attribute"> <%= call_hook :show_issue_view_right, {issue: issue} %>
<div class="label"><span><%=t(:field_vehicle)%></span>:</div>
<div class="value"><%= vehicle %></div>
</div>
<div class="vehicle_vin attribute">
<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><%=t(:field_notes)%></span>:</div>
<div class="value">
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; ">
<%=notes%>
</pre>
</div>
</div>
</div> </div>
</div> </div>

View File

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

View File

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

View File

@@ -1,53 +0,0 @@
<div class="issue">
<div class="splitcontent">
<div class="splitcontentleft">
<h4><%=t(:label_details)%>:</h4>
<table>
<tbody>
<tr>
<th><%= t(:field_customer)%></th>
<td><%= link_to vehicle.customer.name, customer_path(vehicle.customer) %></td>
</tr>
<tr>
<th><%= t(:field_vehicle) %></th>
<td><%= vehicle.to_s %></td>
</tr>
<tr>
<th><%= t(:field_vin) %></th>
<td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
</tr>
<th><%= t(:label_trim) %></th>
<td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
</tr>
</tbody>
</table>
</div>
<div class="splitcontentleft">
<h4><%=t(:field_notes)%>:</h4>
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; ">
<td><%= vehicle.notes %></td>
</pre>
</tr>
<script>
const preElement = document.getElementById('note-display');
// This takes the text, trims the edges, and puts it back
preElement.textContent = preElement.textContent.trim();
</script>
</div>
</div>
</div>
<div style="float: right;">
<%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%>
<%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %>
</div>

View File

@@ -1,56 +0,0 @@
<div class="row">
<div class="span6 columns">
<fieldset>
<%= form_for @vehicle do |f| %>
<div class="clearfix">
<%=t(:field_customer)%>:
<div class="input">
<%= f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :value => @customer.name, :update_elements => {:id => '#customer_id', :value => '#issue_customer'}, :required => true %>
<%= f.hidden_field :customer_id, :id => "customer_id", :value => @customer.id %>
</div>
</div>
<div class="clearfix">
<%=t(:label_year)%>:
<div class="input">
<%= f.number_field :year, :autocomplete => "off" %>
</div>
</div>
<div class="clearfix">
<%=t(:label_make)%>:
<div class="input">
<%= f.text_field :make, :autocomplete => "off" %>
</div>
</div>
<div class="clearfix">
<%=t(:label_model)%>:
<div class="input">
<%= f.text_field :model, :autocomplete => "off" %>
</div>
</div>
<div class="clearfix">
<%=t(:field_vin)%>:
<div class="input">
<%= f.text_field :vin , :autofocus => true %>
</div>
</div>
<div class="clearfix">
<%=t(:field_notes)%>:
<div class="input">
<%= f.text_area :notes, :cols => 60, :rows => 10, :no_label => true %>
</div>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>
</fieldset>
</div>
</div>

View File

@@ -1,28 +0,0 @@
<% if @vehicles.present? %>
<% @vehicles.each do |vehicle| %>
<div class="row">
<div>
<b><%= link_to "##{vehicle.id}", vehicle_path(vehicle) %> </b>
</div>
<div>
<%= vehicle.to_s %>
<br/>
<%= vehicle.customer %>
<br/>
<%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
</div>
</div>
<br/>
<% end %>
<div class="actions">
<%= will_paginate @vehicles %>
</div>
<p><%=t(:label_matching)%> <%=@vehicles.count%> <%=t(:field_vehicles) %> </p>
<% else %>
<p><%=t(:label_no_vehicles)%> <%= params[:search] %>.</p>
<% end %>

View File

@@ -1,4 +0,0 @@
<%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), :autocomplete => "off" %>
<%= submit_tag t(:label_search) %>
<% end %>

View File

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

View File

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

View File

@@ -1,4 +0,0 @@
<h2><%=t(:label_cusomer_vehicles)%> <span style="float:right"> <%= render :partial => 'vehicles/search' %> </span> </h2>
<br/>
<%= render :partial => 'vehicles/list' %>

View File

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

View File

@@ -1,11 +0,0 @@
<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%></h2>
<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>

View File

@@ -1,10 +1,5 @@
$(function() { $(function() {
$("input#issue_customer_id").on("change", function() { $("input#issue_customer_id").on("change", function() {
$.ajax({
url: "/filter_vehicles_by_customer",
type: "GET",
data: { selected_customer: $("input#issue_customer_id").val() }
});
$.ajax({ $.ajax({
url: "/filter_estimates_by_customer", url: "/filter_estimates_by_customer",
@@ -13,11 +8,4 @@ $(function() {
}); });
}); });
$("input#project_customer_id").on("change", function() {
$.ajax({
url: "/filter_vehicles_by_customer",
type: "GET",
data: { selected_customer: $("input#project_customer_id").val() }
});
});
}); });

View File

@@ -12,13 +12,9 @@
# Usage I18n.t(:label) # Usage I18n.t(:label)
en: en:
field_customer: "Customer" field_customer: "Customer"
field_item: "Item"
field_employee: "Employee" field_employee: "Employee"
field_invoice: "Invoice" field_invoice: "Invoice"
field_estimate: "Estimate" field_estimate: "Estimate"
field_vehicles: "Vehicles"
field_vehicle: "Vehicle"
field_vin: "VIN"
field_notes: "Notes" field_notes: "Notes"
field_billed: "Billed" field_billed: "Billed"
label_week: "Week" label_week: "Week"
@@ -31,13 +27,8 @@ en:
label_year: "Year" label_year: "Year"
label_make: " Make" label_make: " Make"
label_model: "Model" 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_no_customers: "There are no customers containing the term(s)"
label_matching: "Matching " 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_open_issues: "Open Issues"
label_closed_issues: "Closed Issues" label_closed_issues: "Closed Issues"
label_sync: "Sync" label_sync: "Sync"
@@ -62,7 +53,6 @@ en:
label_customer_count: "Customer Count" label_customer_count: "Customer Count"
label_invoice_count: "Invoice Count" label_invoice_count: "Invoice Count"
label_estimate_count: "Estimate Count" label_estimate_count: "Estimate Count"
label_item_count: "Item Count"
label_employee_count: "Employee Count" label_employee_count: "Employee Count"
label_client_id: "Intuit QBO OAuth2 Client ID" label_client_id: "Intuit QBO OAuth2 Client ID"
label_client_secret: "Intuit QBO OAuth2 Client Secret" label_client_secret: "Intuit QBO OAuth2 Client Secret"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -11,7 +11,7 @@
class CreateQboPurchases< ActiveRecord::Migration[5.1] class CreateQboPurchases< ActiveRecord::Migration[5.1]
def change def change
create_table :qbo_purchases, id: false do |t| 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.integer :line_id
t.string :description t.string :description
t.integer :customer_id t.integer :customer_id

View File

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

View File

@@ -1,15 +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.
class UpdateIssuesWithVehicles < ActiveRecord::Migration[5.1]
def change
add_reference :issues, :vehicles, index: true
end
end

View File

@@ -1,15 +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.
class UpdateVehicles < ActiveRecord::Migration[5.1]
def change
add_column :vehicles, :name, :text
end
end

View File

@@ -12,6 +12,5 @@ class QbocustomersToCustomers< ActiveRecord::Migration[5.1]
def change def change
rename_table :qbo_customers, :customers rename_table :qbo_customers, :customers
rename_column :issues, :qbo_customer_id, :customer_id rename_column :issues, :qbo_customer_id, :customer_id
rename_column :vehicles, :qbo_customer_id, :customer_id
end end
end end

View File

@@ -10,12 +10,12 @@
class AddIssuesQboInvoices < ActiveRecord::Migration[5.1] class AddIssuesQboInvoices < ActiveRecord::Migration[5.1]
def self.up 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 :issue
t.references :qbo_invoice t.references :qbo_invoice
end 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! # 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" execute "insert into issues_qbo_invoices(issue_id, qbo_invoice_id) select id, qbo_invoice_id from issues"

View File

@@ -1,16 +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.
class UpdateProjects < ActiveRecord::Migration[5.1]
def change
add_reference :projects, :customer, index: true
add_reference :projects, :vehicle, index: true
end
end

View File

@@ -30,7 +30,7 @@ class AddTxnDates < ActiveRecord::Migration[5.1]
qbo = Qbo.first qbo = Qbo.first
invoices = qbo.perform_authenticated_request do |access_token| 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 service.all
end end

View File

@@ -1,33 +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.
class UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
def change
begin
add_column :vehicles, :doors, :text
add_column :vehicles, :trim, :text
reversible do |direction|
direction.up {
# Update local vehicle database by forcing a save, look at before_save
vehicles = Vehicle.all
vehicles.each { |vehicle|
vehicle.save!
}
}
end
rescue
logger.error "Failed to update vehicles"
end
end
end

20
init.rb
View File

@@ -11,37 +11,31 @@
Redmine::Plugin.register :redmine_qbo do Redmine::Plugin.register :redmine_qbo do
# About # About
name 'Redmine Quickbooks Online plugin' name 'Redmine QBO plugin'
author 'Rick Barrette' 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' 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.1' version '2026.1.5'
url 'https://github.com/rickbarrette/redmine_qbo' url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'https://barrettefabrication.com' author_url 'https://barrettefabrication.com'
settings :default => {'empty' => true}, :partial => 'qbo/settings' settings default: {'empty' => true}, partial: 'qbo/settings'
requires_redmine :version_or_higher => '6.1.0' requires_redmine version_or_higher: '6.1.0'
# Add safe attributes for core models # Add safe attributes for core models
Issue.safe_attributes 'customer_id' Issue.safe_attributes 'customer_id'
Issue.safe_attributes 'item_id'
Issue.safe_attributes 'estimate_id' Issue.safe_attributes 'estimate_id'
Issue.safe_attributes 'invoice_id' Issue.safe_attributes 'invoice_id'
Issue.safe_attributes 'vehicles_id'
User.safe_attributes 'employee_id' User.safe_attributes 'employee_id'
TimeEntry.safe_attributes 'billed' TimeEntry.safe_attributes 'billed'
Project.safe_attributes 'customer_id'
Project.safe_attributes 'vehicle_id'
# set per_page globally # set per_page globally
WillPaginate.per_page = 20 WillPaginate.per_page = 20
# Permissions for security # Permissions for security
permission :view_customers, :customers => :index, :public => false permission :view_customers, customers: :index, public: false
permission :add_customers, :customers => :new, :public => false permission :add_customers, customers: :new, public: false
permission :view_vehicles, :vehicles => :new, :public => false
# Register top menu items # 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: 'Customers', if: Proc.new {User.current.logged?}
menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
end end

View File

@@ -20,65 +20,35 @@ module Hooks
f = context[:form] f = context[:form]
issue = context[:issue] issue = context[:issue]
# check project level customer ownership first
# This is done to preload customer information if the entire project is dedicated to a customer
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 the issue already belongs to a customer
selected_customer = issue.customer ? issue.customer.id : nil
selected_estimate = issue.estimate ? issue.estimate.id : nil
selected_vehicle = issue.vehicles_id ? issue.vehicles_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 # Customer Name Text Box with database backed autocomplete
# onchange event will update the hidden customer_id field
search_customer = f.autocomplete_field :customer, search_customer = f.autocomplete_field :customer,
autocomplete_customer_name_customers_path, autocomplete_customer_name_customers_path,
:selected => selected_customer, selected: issue.customer,
:onchange => js_link, update_elements: {
:update_elements => { id: '#issue_customer_id',
:id => '#issue_customer_id', value: '#issue_customer'
: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, customer_id = f.hidden_field :customer_id,
:id => "issue_customer_id", id: "issue_customer_id",
:onchange => js_link onchange: "updateIssueFrom('#{escape_javascript update_issue_form_path(issue.project, issue)}', this)".html_safe
# Load estimates & vehicles # Generate the drop down list of quickbooks estimates owned by the selected customer
if issue.customer select_estimate = f.select :estimate_id,
if customer.vehicles issue.customer ? issue.customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x} : [],
vehicles = customer.vehicles.pluck(:name, :id) selected: issue.estimate,
else include_blank: true
vehicles = [nil].compact
end
estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
else
vehicles = [nil].compact
estimates = [nil].compact
end
# Generate the drop down list of quickbooks estimates & vehicles
select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
# Pass all prebuilt form components to our partial # Pass all prebuilt form components to our partial
context[:controller].send(:render_to_string, { context[:controller].send(:render_to_string, {
:partial => 'issues/form_hook', partial: 'issues/form_hook',
locals: { locals: {
search_customer: search_customer, search_customer: search_customer,
customer_id: customer_id, customer_id: customer_id,
js_link: js_link, select_estimate: select_estimate
select_estimate: select_estimate,
vehicle: vehicle
} }
} }
) )

View File

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

View File

@@ -13,51 +13,25 @@ module Hooks
class IssuesShowHookListener < Redmine::Hook::ViewListener class IssuesShowHookListener < Redmine::Hook::ViewListener
# View Issue # 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={}) def view_issues_show_details_bottom(context={})
issue = context[:issue] issue = context[:issue]
# Check to see if there is a quickbooks user attached to the issue # Build a list of invoice links
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
invoice_link = "" invoice_link = ""
if issue.invoice_ids if issue.invoices
issue.invoice_ids.each do |i| issue.invoices.each do |i|
invoice = Invoice.find i invoice_link += "#{link_to i, i, target: :_blank}<br/>"
invoice_link = invoice_link + link_to( invoice.doc_number, invoice_path( i ), :target => "_blank").to_s + " "
invoice_link = invoice_link.html_safe
end end
end end
begin
v = Vehicle.find(issue.vehicles_id)
vehicle = link_to v.to_s, vehicle_path( v.id )
vin = v.vin
notes = v.notes
rescue
#do nothing
end
split_vin = vin.scan(/.{1,9}/) if vin
context[:controller].send(:render_to_string, { context[:controller].send(:render_to_string, {
:partial => 'issues/show_details', partial: 'issues/show_details',
locals: { locals: {
customer: customer, customer: issue.customer ? link_to(issue.customer): nill,
estimate_link: estimate_link, estimate_link: issue.estimate ? link_to(issue.estimate, issue.estimate, target: :_blank) : nil,
invoice_link: invoice_link, invoice_link: invoice_link.html_safe,
vehicle: vehicle, issue: issue
split_vin: split_vin,
notes: notes
} }
}) })
end end

View File

@@ -1,40 +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.
module Hooks
class ProjectsFormHookListener < Redmine::Hook::ViewListener
# Edit Project Form
def view_projects_form(context={})
f = context[:form]
# Check to see if there is a quickbooks user attached to the issue
selected_customer = context[:project].customer ? context[:project].customer : nil
selected_vehicle = context[:project].vehicle_id ? context[:project].vehicle_id : nil
# Load customer information
customer = Customer.find_by_id(selected_customer) if selected_customer
search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#project_customer_id', :value => '#project_customer'}
customer_id = f.hidden_field :customer_id, :id => "project_customer_id"
if context[:project].customer
vehicles = customer.vehicles.pluck(:name, :id).sort!
else
vehicles = [nil].compact
end
vehicle = f.select :vehicle_id, vehicles, :selected => selected_vehicle, include_blank: true
return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{vehicle}</p>"
end
end
end

View File

@@ -22,7 +22,7 @@ module Hooks
@selected = context[:user].employee.id if context[:user].employee @selected = context[:user].employee.id if context[:user].employee
# Generate the drop down list of quickbooks contacts # 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
end end

View File

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

View File

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

View File

@@ -28,7 +28,6 @@ module Patches
belongs_to :customer_token, primary_key: :id belongs_to :customer_token, primary_key: :id
belongs_to :estimate, primary_key: :id belongs_to :estimate, primary_key: :id
has_and_belongs_to_many :invoices has_and_belongs_to_many :invoices
belongs_to :vehicle, primary_key: :id
end end
end end
@@ -56,8 +55,8 @@ module Patches
# Prepare to create a new Time Activity # Prepare to create a new Time Activity
qbo = Qbo.first qbo = Qbo.first
qbo.perform_authenticated_request do |access_token| qbo.perform_authenticated_request do |access_token|
time_service = Quickbooks::Service::TimeActivity.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) item_service = Quickbooks::Service::Item.new(company_id: qbo.realm_id, access_token: access_token)
time_entry = Quickbooks::Model::TimeActivity.new time_entry = Quickbooks::Model::TimeActivity.new
# Lets total up each activity before billing. # Lets total up each activity before billing.

View File

@@ -58,13 +58,13 @@ module Patches
#left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_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_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
v = Vehicle.find_by_id(issue.vehicles_id) logger.debug "Calling :pdf_left hook"
vehicle = v ? v.to_s : nil left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
vin = v ? v.vin : nil unless left_hook_output.nil?
notes = v ? v.notes : nil left_hook_output.each do |l|
left << [l(:field_vehicles), vehicle] left.concat l unless l.nil?
left << [l(:field_vin), vin ? vin.gsub(/(.{9})/, '\1 ') : nil] end
#left << [l(:field_notes), notes] end
right = [] right = []
right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date') right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
@@ -72,7 +72,14 @@ module Patches
right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio') 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_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project) right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
right << [l(:field_notes), notes]
logger.debug "Calling :pdf_right hook"
right_hook_output = Redmine::Hook.call_hook :pdf_right, { issue: issue }
unless right_hook_output.nil?
right_hook_output.each do |r|
right.concat r unless r.nil?
end
end
rows = left.size > right.size ? left.size : right.size rows = left.size > right.size ? left.size : right.size
while left.size < rows while left.size < rows
@@ -136,10 +143,10 @@ module Patches
# Set resize image scale # Set resize image scale
pdf.set_image_scale(1.6) pdf.set_image_scale(1.6)
text = textilizable(issue, :description, text = textilizable(issue, :description,
:only_path => false, only_path: false,
:edit_section_links => false, edit_section_links: false,
:headings => false, headings: false,
:inline_attachments => false inline_attachments: false
) )
pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB") pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB")
@@ -226,10 +233,10 @@ module Patches
pdf.ln unless journal.details.empty? pdf.ln unless journal.details.empty?
pdf.SetFontStyle('',8) pdf.SetFontStyle('',8)
text = textilizable(journal, :notes, text = textilizable(journal, :notes,
:only_path => false, only_path: false,
:edit_section_links => false, edit_section_links: false,
:headings => false, headings: false,
:inline_attachments => false inline_attachments: false
) )
pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "") pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "")
end end

View File

@@ -1,44 +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_dependency 'project'
module Patches
# Patches Redmine's Projects dynamically.
# Adds a relationships
module ProjectPatch
def self.included(base) # :nodoc:
base.extend(ClassMethods)
base.send(:include, InstanceMethods)
# Same as typing in the class
base.class_eval do
belongs_to :customer, primary_key: :id
belongs_to :vehicle, primary_key: :id
end
end
end
module ClassMethods
end
module InstanceMethods
end
# Add module to Project
Project.send(:include, ProjectPatch)
end

View File

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

View File

@@ -18,14 +18,14 @@ module Patches
def available_columns def available_columns
unless @available_columns unless @available_columns
@available_columns = self.class.available_columns.dup @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 end
super super
end end
# Add QBO options to the filter # Add QBO options to the filter
def initialize_available_filters def initialize_available_filters
add_available_filter "billed", :type => :boolean add_available_filter "billed", type: :boolean
super super
end end

View File

@@ -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