Compare commits
3 Commits
139f5dd618
...
2026.2.8
| Author | SHA1 | Date | |
|---|---|---|---|
| d2b9113914 | |||
| 447e048819 | |||
| e7dfc3f2ad |
BIN
Screenshots/issue.png
Normal file
|
After Width: | Height: | Size: 724 KiB |
BIN
Screenshots/issue_form.png
Normal file
|
After Width: | Height: | Size: 520 KiB |
|
Before Width: | Height: | Size: 346 KiB After Width: | Height: | Size: 672 KiB |
|
Before Width: | Height: | Size: 303 KiB After Width: | Height: | Size: 538 KiB |
|
Before Width: | Height: | Size: 240 KiB |
|
Before Width: | Height: | Size: 512 KiB |
@@ -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
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
2
init.rb
@@ -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.8'
|
||||||
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'
|
||||||
|
|||||||