Merge branch 'master' into dev

This commit is contained in:
2022-03-19 05:49:54 -04:00
2 changed files with 11 additions and 11 deletions

View File

@@ -70,26 +70,26 @@ class Invoice < ActiveRecord::Base
end end
# processes the invoice into the database # processes the invoice into the database
def self.process_invoice(invoice) def self.process_invoice(i)
logger.info "Processing invoice #{invoice.id}" logger.info "Processing invoice #{i.id}"
# Load the invoice into the database # Load the invoice into the database
invoice = Invoice.find_or_create_by(id: invoice.id) invoice = Invoice.find_or_create_by(id: i.id)
invoice.doc_number = invoice.doc_number invoice.doc_number = i.doc_number
invoice.id = invoice.id invoice.id = i.id
invoice.customer_id = invoice.customer_ref invoice.customer_id = i.customer_ref
invoice.txn_date = invoice.txn_date invoice.txn_date = i.txn_date
invoice.save! invoice.save!
# Scan the private notes for hashtags and attach to the applicable issues # Scan the private notes for hashtags and attach to the applicable issues
if not invoice.private_note.nil? if not i.private_note.nil?
invoice.private_note.scan(/#(\w+)/).flatten.each { |issue| i.private_note.scan(/#(\w+)/).flatten.each { |issue|
attach_to_issue(Issue.find_by_id(issue.to_i), invoice) attach_to_issue(Issue.find_by_id(issue.to_i), invoice)
} }
end end
# Scan the line items for hashtags and attach to the applicable issues # Scan the line items for hashtags and attach to the applicable issues
invoice.line_items.each { |line| i.line_items.each { |line|
if line.description if line.description
line.description.scan(/#(\w+)/).flatten.each { |issue| line.description.scan(/#(\w+)/).flatten.each { |issue|
attach_to_issue(Issue.find_by_id(issue.to_i), invoice) attach_to_issue(Issue.find_by_id(issue.to_i), invoice)

View File

@@ -22,7 +22,7 @@ Redmine::Plugin.register :redmine_qbo do
name 'Redmine Quickbooks Online plugin' name 'Redmine Quickbooks Online 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 '1.1.5' version '1.1.6'
url 'https://github.com/rickbarrette/redmine_qbo' url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'http://rickbarrette.org' author_url 'http://rickbarrette.org'
settings :default => {'empty' => true}, :partial => 'qbo/settings' settings :default => {'empty' => true}, :partial => 'qbo/settings'