Compare commits

...

8 Commits

Author SHA1 Message Date
02f34582f4 2026.2.10
Addressed the Bullet (the N+1 query detector) warning to include customers
2026-02-16 18:56:09 -05:00
2f9ef6304f scope.includes(:customer) 2026-02-16 18:53:29 -05:00
886d5f4ace 2026.2.9 2026-02-16 08:15:46 -05:00
1ade938eb3 Fixed Querying issues by customer name 2026-02-16 08:13:57 -05:00
3111f391f3 Filter by customer works now 2026-02-15 21:34:22 -05:00
d2b9113914 2026.2.8 2026-02-14 18:57:22 -05:00
447e048819 updated screensots 2026-02-14 09:32:40 -05:00
e7dfc3f2ad added sync estimates by id 2026-02-14 08:25:02 -05:00
10 changed files with 52 additions and 8 deletions

BIN
Screenshots/issue.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 KiB

BIN
Screenshots/issue_form.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 KiB

After

Width:  |  Height:  |  Size: 672 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 KiB

After

Width:  |  Height:  |  Size: 538 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 KiB

View File

@@ -15,18 +15,31 @@ class EstimateController < ApplicationController
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
e = Estimate.find_by_doc_number(params[:search]) if params[:search]
e = Estimate.find_by_id(params[:id]) if params[:id]
# Force sync for estimate by doc number if not found # Force sync for estimate by doc number if not found
if Estimate.find_by_doc_number(params[:search]).nil? if e.nil? && params[:search]
begin begin
Estimate.sync_by_doc_number(params[:search]) if params[:search] Estimate.sync_by_doc_number(params[:search])
e = Estimate.find_by_doc_number(params[:search])
rescue rescue
logger.info "Estimate.find_by_doc_number failed" logger.info "Estimate.find_by_doc_number failed"
end end
end end
estimate = Estimate.find_by_id(params[:id]) if params[:id] # Force sync for estimate by id if not found
estimate = Estimate.find_by_doc_number(params[:search]) if params[:search] if e.nil? && params[:id]
return estimate begin
Estimate.sync_by_id(params[:id])
e = Estimate.find_by_id(params[:id])
rescue
logger.info "Estimate.find_by_id failed"
end
end
return e
end end
# #

View File

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
name 'Redmine QBO plugin' name 'Redmine QBO plugin'
author 'Rick Barrette' author 'Rick Barrette'
description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed' description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed'
version '2026.2.7' version '2026.2.10'
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'

View File

@@ -25,7 +25,7 @@ module RedmineQbo
# Same as typing in the class # Same as typing in the class
base.class_eval do base.class_eval do
belongs_to :customer, primary_key: :id belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true
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

View File

@@ -14,6 +14,20 @@ module RedmineQbo
module Patches module Patches
module QueryPatch module QueryPatch
def base_scope
scope = super
if filters['customer_name'].present?
scope = scope.left_outer_joins(:customer)
end
if has_column?(:customer) || filters['customer_name'].present?
scope = scope.includes(:customer)
end
scope
end
# Add qbo options to the aviable columns # Add qbo options to the aviable columns
def available_columns def available_columns
unless @available_columns unless @available_columns
@@ -26,10 +40,27 @@ module RedmineQbo
# 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_id", type: :list, name: l(:field_customer), :values => lambda {Customer.pluck(:name, :id).map {|name, id| [name, id.to_s]}}
add_available_filter( 'customer_name', type: :text, name: l(:field_customer))
super super
end end
def sql_for_customer_name_field(field, operator, value)
pattern = "%#{value.first}%"
sql = case operator
when '~'
"#{Customer.table_name}.name LIKE ?"
when '!~'
"#{Customer.table_name}.name NOT LIKE ?"
else
return nil
end
Issue.joins(:customer).sanitize_sql_for_conditions([sql, pattern])
end
end end
# Add module to Issue # Add module to Issue