Merge branch 'import'

This commit is contained in:
2016-04-01 06:35:02 -04:00
7 changed files with 57 additions and 32 deletions

View File

@@ -20,10 +20,10 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
#QboEstimate.update_all
# Check to see if there is a quickbooks user attached to the issue
selected_customer = context[:issue].qbo_customer.id if context[:issue].qbo_customer
selected_item = context[:issue].qbo_item.id if context[:issue].qbo_item
selected_invoice = context[:issue].qbo_invoice.id if context[:issue].qbo_invoice
selected_estimate = context[:issue].qbo_estimate.id if context[:issue].qbo_estimate
@selected_customer = context[:issue].qbo_customer ? context[:issue].qbo_customer.id : nil
@selected_item = context[:issue].qbo_item ? context[:issue].qbo_item.id : nil
@selected_invoice = context[:issue].qbo_invoice ? context[:issue].qbo_invoice.id : nil
@selected_estimate = context[:issue].qbo_estimate ? context[:issue].qbo_estimate.id : nil
# Generate the drop down list of quickbooks customers
@select_customer = context[:form].select :qbo_customer_id, QboCustomer.all.pluck(:name, :id).sort, :selected => selected_customer, include_blank: true

View File

@@ -21,21 +21,23 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
issue = context[:issue]
# Check to see if there is a quickbooks user attached to the issue
@customer = issue.qbo_customer.name if issue.qbo_customer
@customer = issue.qbo_customer ? issue.qbo_customer.name : nil
# Check to see if there is a quickbooks item attached to the issue
@item = issue.qbo_item.name if issue.qbo_item
@item = issue.qbo_item ? issue.qbo_item.name : nil
@estimate = nil
@estimate_link = nil
# Estimate Number
if issue.qbo_estimate
QboEstimate.update(issue.qbo_estimate.id)
@estimate = issue.qbo_estimate.doc_number
@estimate_link = link_to @estimate, "#{Redmine::Utils::relative_url_root }/qbo/estimate/#{issue.qbo_estimate.id}", :target => "_blank"
end
@invoice = nil
@invo = nil
# Invoice Number
if issue.qbo_invoice
QboInvoice.update(issue.qbo_invoice.id)
@invoice = issue.qbo_invoice.doc_number
@invoice_link = link_to @invoice, "#{Redmine::Utils::relative_url_root }/qbo/invoice/#{issue.qbo_invoice.id}", :target => "_blank"
end