Compare commits

...

9 Commits

Author SHA1 Message Date
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
31406af681 Version bump 2026.1.1 2026-01-26 10:09:24 -05:00
479be461a6 Dynamically load updateIssueFrom javascript path 2026-01-26 10:08:53 -05:00
c1af031d22 Link to sandbox if enabled 2026-01-23 21:40:08 -05:00
a741cd0217 update readme 2026-01-22 21:54:03 -05:00
5 changed files with 18 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://app.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo['sandbox'] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %> </h2>
<div class="issue">
<div class="splitcontent">

View File

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

View File

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
name 'Redmine QBO DEVELOPMENT plugin'
author 'Rick Barrette'
description 'This is a plugin for Redmine to intergrate with Quickbooks Online to allow for seamless intergration CRM and invoicing of completed issues'
version '2026.1.0'
version '2026.1.2'
url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'https://barrettefabrication.com'
settings :default => {'empty' => true}, :partial => 'qbo/settings'

View File

@@ -12,6 +12,8 @@ module Hooks
class IssuesFormHookListener < Redmine::Hook::ViewListener
include IssuesHelper
# Edit Issue Form
# Here we build the required form components before passing them to a partial view formatting.
def view_issues_form_details_bottom(context={})
@@ -29,7 +31,7 @@ module Hooks
selected_estimate = issue.estimate ? issue.estimate.id : nil
# Gernerate edit.js link
js_link = issue.new_record? ? "updateIssueFrom('/projects/rmt/issues/new.js', this)" : "updateIssueFrom('/issues/#{issue.id}/edit.js', this)"
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
@@ -65,8 +67,7 @@ module Hooks
locals: {
search_customer: search_customer,
customer_id: customer_id,
js_link: js_link,
select_estimate: select_estimate,
select_estimate: select_estimate
}
}
)

View File

@@ -59,8 +59,12 @@ module Patches
#left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
logger.debug "Calling :pdf_left hook"
context = Redmine::Hook.call_hook :pdf_left, { array: left, issue: issue }
left << context.first unless context.nil?
left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue }
unless left_hook_output.nil?
left_hook_output.each do |l|
left.concat l unless l.nil?
end
end
right = []
right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
@@ -70,8 +74,12 @@ module Patches
right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
logger.debug "Calling :pdf_right hook"
context = Redmine::Hook.call_hook :pdf_right, { array: right, issue: issue }
right << context.first unless context.nil?
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
while left.size < rows