Merge branch 'dev' into hooks

This commit is contained in:
2023-12-30 23:43:10 -05:00
35 changed files with 13 additions and 644 deletions

View File

@@ -26,7 +26,6 @@ module IssuePatch
belongs_to :customer_token, primary_key: :id
belongs_to :estimate, primary_key: :id
has_and_belongs_to_many :invoices
belongs_to :vehicle, primary_key: :id
end
end

View File

@@ -26,13 +26,11 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
# This is done to preload customer information if the entire project is dedicated to a customer
if context[:project]
selected_customer = context[:project].customer ? context[:project].customer.id : nil
selected_vehicle = context[:project].vehicle ? context[:project].vehicle.id : nil
end
# Check to see if the issue already belongs to a customer
selected_customer = context[:issue].customer ? context[:issue].customer.id : nil
selected_estimate = context[:issue].estimate ? context[:issue].estimate.id : nil
selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
# Load customer information
customer = Customer.find_by_id(selected_customer) if selected_customer
@@ -52,22 +50,15 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
:id => "issue_customer_id",
:onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
# Load estimates & vehicles
# Load estimates
if context[:issue].customer
if customer.vehicles
vehicles = customer.vehicles.pluck(:name, :id)
else
vehicles = [nil].compact
end
estimates = customer.estimates.pluck(:doc_number, :id).sort! {|x, y| y <=> x}
else
vehicles = [nil].compact
estimates = [nil].compact
end
# Generate the drop down list of quickbooks estimates & vehicles
# Generate the drop down list of quickbooks estimates
select_estimate = f.select :estimate_id, estimates, :selected => selected_estimate, include_blank: true
vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
# Pass all prebuilt form components to our partial
context[:controller].send(:render_to_string, {
@@ -77,7 +68,6 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
customer_id: customer_id,
context: context,
select_estimate: select_estimate,
vehicle: vehicle
}
}
)

View File

@@ -35,27 +35,13 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
invoice_link = invoice_link.html_safe
end
end
begin
v = Vehicle.find(issue.vehicles_id)
vehicle = link_to v.to_s, vehicle_path( v.id )
vin = v.vin
notes = v.notes
rescue
#do nothing
end
split_vin = vin.scan(/.{1,9}/) if vin
context[:controller].send(:render_to_string, {
:partial => 'issues/show_details',
locals: {
customer: customer,
estimate_link: estimate_link,
invoice_link: invoice_link,
vehicle: vehicle,
split_vin: split_vin,
notes: notes
invoice_link: invoice_link
}
})
end

View File

@@ -23,7 +23,6 @@ module ProjectPatch
base.class_eval do
unloadable # Send unloadable so it will not be unloaded in development
belongs_to :customer, primary_key: :id
belongs_to :vehicle, primary_key: :id
end
end
end

View File

@@ -16,21 +16,12 @@ class ProjectsFormHookListener < Redmine::Hook::ViewListener
# Check to see if there is a quickbooks user attached to the issue
selected_customer = context[:project].customer ? context[:project].customer : nil
selected_vehicle = context[:project].vehicle_id ? context[:project].vehicle_id : nil
# Load customer information
customer = Customer.find_by_id(selected_customer) if selected_customer
search_customer = f.autocomplete_field :customer, autocomplete_customer_name_customers_path, :selected => selected_customer, :update_elements => {:id => '#project_customer_id', :value => '#project_customer'}
customer_id = f.hidden_field :customer_id, :id => "project_customer_id"
if context[:project].customer
vehicles = customer.vehicles.pluck(:name, :id).sort!
else
vehicles = [nil].compact
end
vehicle = f.select :vehicle_id, vehicles, :selected => selected_vehicle, include_blank: true
return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{vehicle}</p>"
return "<p><label for=\"project_customer\">Customer</label>#{search_customer} #{customer_id}</p>"
end
end

View File

@@ -1,72 +0,0 @@
#The MIT License (MIT)
#
#Copyright (c) 2022 rick barrette
#
#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
#
#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
#
#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# TODO move this into seperate plugin
class QboHookListener < Redmine::Hook::Listener
# Check to see if the Invoice custom field VIN matches
def process_invoice_custom_fields(context = {})
Rails.logger.debug "QboHookListener.process_invoice_custom_fields"
issue = context[:issue]
invoice = context[:invoice]
is_changed = false
# update the invoive custom fields with infomation from the issue if available
invoice.custom_fields.each { |cf|
# VIN from the attached vehicle
begin
if cf.name.eql? "VIN"
# Only update if blank to prevent infite loops
# TODO check cf_sync_confict flag once implemented
if cf.string_value.to_s.blank?
logger.debug " VIN was blank, updating the invoice vin in quickbooks"
vin = Vehicle.find(issue.vehicles_id).vin
break if vin.nil?
if not cf.string_value.to_s.eql? vin
cf.string_value = vin.to_s
logger.debug "VIN has changed"
is_changed = true
end
end
end
rescue
#do nothing
end
}
return { issue: issue, invoice: invoice, is_changed: is_changed }
end
# Add vehicle information to the left side of the pdf attribute block
def pdf_left(context = {})
left = []
issue = context[:issue]
v = Vehicle.find_by_id(issue.vehicles_id)
vehicle = v.to_s unless v.nil?
vin = v.vin.gsub(/(.{9})/, '\1 ') unless v.nil?
left << [l(:field_vehicles), vehicle]
left << [l(:field_vin), vin]
return left
end
# Add vehicle information to the right side of the pdf attribute block
def pdf_right(context = {})
right = []
issue = context[:issue]
v = Vehicle.find_by_id(issue.vehicles_id)
notes = v unless v.nil?
right << [l(:field_notes), notes]
return right
end
end