mirror of
https://github.com/rickbarrette/redmine_qbo_vehicles.git
synced 2026-04-02 15:11:58 -04:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a1678d353 | |||
| 28957c5dff | |||
| a67b75671e | |||
| 492ff000bf | |||
| e0fc07141c | |||
| 3e6c2672e0 | |||
| 71bde3a249 | |||
| 4f2ae19460 | |||
| 9ee792cbd8 | |||
| ae7ccbf4b0 | |||
| 550601b5c9 | |||
| 85cd02b16a | |||
| 4b8b3c3495 | |||
| b2c1bebea3 | |||
| 2bd13a819b | |||
| d6138843f8 | |||
| 452568e8b3 |
@@ -60,10 +60,15 @@ class VehiclesController < ApplicationController
|
|||||||
# display a specific vehicle
|
# display a specific vehicle
|
||||||
def show
|
def show
|
||||||
begin
|
begin
|
||||||
@vehicle = Vehicle.find_by_id(params[:id])
|
@vehicle = Vehicle.includes(issues: [:estimate, :invoices]).find(params[:id])
|
||||||
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
|
@vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
|
||||||
@issues = @vehicle.issues.order(id: :desc)
|
@issues = @vehicle.issues
|
||||||
@closed_issues = (@issues - @issues.open)
|
.joins(:status)
|
||||||
|
.includes(:estimate, :invoices, :status, :project, :tracker, :priority)
|
||||||
|
.order(id: :desc)
|
||||||
|
@open_issues = @issues.select { |i| !i.status.is_closed }
|
||||||
|
@closed_issues = @issues.select { |i| i.status.is_closed }
|
||||||
|
|
||||||
flash[:error] = t :alert_no_customer if @vehicle.customer.nil?
|
flash[:error] = t :alert_no_customer if @vehicle.customer.nil?
|
||||||
rescue
|
rescue
|
||||||
flash[:error] = t :alert_vehicle_not_found
|
flash[:error] = t :alert_vehicle_not_found
|
||||||
|
|||||||
@@ -10,51 +10,24 @@
|
|||||||
|
|
||||||
class Vehicle < ActiveRecord::Base
|
class Vehicle < ActiveRecord::Base
|
||||||
|
|
||||||
|
include Redmine::Acts::Searchable
|
||||||
|
include Redmine::Acts::Event
|
||||||
|
|
||||||
belongs_to :customer
|
belongs_to :customer
|
||||||
has_many :issues
|
has_many :issues
|
||||||
validates_presence_of :customer
|
validates_presence_of :customer
|
||||||
validates :vin, uniqueness: true
|
validates :vin, uniqueness: true
|
||||||
before_save :decode_vin
|
before_save :decode_vin
|
||||||
|
|
||||||
# returns a human readable string
|
acts_as_searchable columns: %w[vin make model year],
|
||||||
def to_s
|
scope: ->(_context) { left_joins(:project) },
|
||||||
if year.nil? or make.nil? or model.nil?
|
date_column: :updated_at
|
||||||
return "#{vin}"
|
|
||||||
else
|
|
||||||
split_vin = vin.scan(/.{1,9}/)
|
|
||||||
return "#{year} #{make} #{model} - #{split_vin[1]}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# returns the raw JSON details from NHTSA
|
acts_as_event :title => Proc.new {|o| "#{o.to_s}"},
|
||||||
def details
|
:url => Proc.new {|o| { :controller => 'vehicles', :action => 'show', :id => o.id} },
|
||||||
get_details if @details.nil?
|
:type => :to_s,
|
||||||
return @details
|
:description => Proc.new {|o| "#{o.vin} - #{o.customer}"},
|
||||||
end
|
:datetime => Proc.new {|o| o.updated_at || o.created_at}
|
||||||
|
|
||||||
# Force Upper Case for make numbers
|
|
||||||
def make=(val)
|
|
||||||
# The to_s is in case you get nil/non-string
|
|
||||||
write_attribute(:make, val.to_s.titleize)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Force Upper Case for model numbers
|
|
||||||
def model=(val)
|
|
||||||
# The to_s is in case you get nil/non-string
|
|
||||||
write_attribute(:model, val.to_s.titleize)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
|
|
||||||
def vin=(val)
|
|
||||||
val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
|
|
||||||
write_attribute(:vin, val)
|
|
||||||
end
|
|
||||||
|
|
||||||
# search for a vehicle by vin, make, model, or year
|
|
||||||
def self.search(query)
|
|
||||||
q = sanitize_sql_like(query)
|
|
||||||
where("vin LIKE ? OR make LIKE ? OR model LIKE ? OR year LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%", "%#{q}%")
|
|
||||||
end
|
|
||||||
|
|
||||||
# decodes a vin and updates self
|
# decodes a vin and updates self
|
||||||
def decode_vin
|
def decode_vin
|
||||||
@@ -73,9 +46,10 @@ class Vehicle < ActiveRecord::Base
|
|||||||
self.name = to_s
|
self.name = to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
# reurns all invoices for this vehicle
|
# returns the raw JSON details from NHTSA
|
||||||
def invoices
|
def details
|
||||||
self.issues.flat_map(&:invoices).uniq.compact
|
get_details if @details.nil?
|
||||||
|
return @details
|
||||||
end
|
end
|
||||||
|
|
||||||
# returns all estimates for this vehicle
|
# returns all estimates for this vehicle
|
||||||
@@ -83,6 +57,64 @@ class Vehicle < ActiveRecord::Base
|
|||||||
self.issues.flat_map(&:estimate).uniq.compact
|
self.issues.flat_map(&:estimate).uniq.compact
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# reurns all invoices for this vehicle
|
||||||
|
def invoices
|
||||||
|
self.issues.flat_map(&:invoices).uniq.compact
|
||||||
|
end
|
||||||
|
|
||||||
|
# Force Upper Case for make numbers
|
||||||
|
def make=(val)
|
||||||
|
# The to_s is in case you get nil/non-string
|
||||||
|
write_attribute(:make, val.to_s.titleize)
|
||||||
|
end
|
||||||
|
|
||||||
|
# Force Upper Case for model numbers
|
||||||
|
def model=(val)
|
||||||
|
# The to_s is in case you get nil/non-string
|
||||||
|
write_attribute(:model, val.to_s.titleize)
|
||||||
|
end
|
||||||
|
|
||||||
|
# needed for redmine's search and event system, but we don't want to tie vehicles to projects
|
||||||
|
def project
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
|
||||||
|
# search for a vehicle by vin, make, model, or year
|
||||||
|
def self.search(query)
|
||||||
|
q = sanitize_sql_like(query)
|
||||||
|
where("vin LIKE ? OR make LIKE ? OR model LIKE ? OR year LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%", "%#{q}%")
|
||||||
|
end
|
||||||
|
|
||||||
|
# Override the defult redmine seach method to rank results by id
|
||||||
|
def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
|
||||||
|
return {} if tokens.blank?
|
||||||
|
|
||||||
|
scope = self.all
|
||||||
|
|
||||||
|
tokens.each do |token|
|
||||||
|
scope = scope.search(token)
|
||||||
|
end
|
||||||
|
|
||||||
|
ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
|
||||||
|
ids.index_with { |id| id }
|
||||||
|
end
|
||||||
|
|
||||||
|
# returns a human readable string
|
||||||
|
def to_s
|
||||||
|
if year.nil? or make.nil? or model.nil?
|
||||||
|
return "#{vin}"
|
||||||
|
else
|
||||||
|
split_vin = vin.scan(/.{1,9}/)
|
||||||
|
return "#{year} #{make} #{model} - #{split_vin[1]}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
|
||||||
|
def vin=(val)
|
||||||
|
val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
|
||||||
|
write_attribute(:vin, val)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# init method to pull JSON details from NHTSA
|
# init method to pull JSON details from NHTSA
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<h4><%=t(:field_vehicles)%>:</h4>
|
<h4><%=t(:field_vehicles)%>:</h4>
|
||||||
<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]), show_customer: false, show_checkbox: false } %>
|
<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]), show_customer: false, show_checkbox: true } %>
|
||||||
<div style="float: right;">
|
<div style="float: right;">
|
||||||
<%= button_to t(:button_new_vehicle), new_customer_vehicle_path(customer), method: :get %>
|
<%= button_to t(:button_new_vehicle), new_customer_vehicle_path(customer), method: :get %>
|
||||||
</div>
|
</div>
|
||||||
@@ -19,7 +19,6 @@
|
|||||||
<div class="label-sub">
|
<div class="label-sub">
|
||||||
<div onclick="handleCopy(event)"><%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b></div>
|
<div onclick="handleCopy(event)"><%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b></div>
|
||||||
<% if show_customer %>
|
<% if show_customer %>
|
||||||
<br/>
|
|
||||||
<%= vehicle.customer %>
|
<%= vehicle.customer %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<%= form_tag(vehicles_path, method: "get", id: "search-form") do %>
|
<%= form_tag(vehicles_path, method: "get", id: "vehicles-search-form") do %>
|
||||||
<%= text_field_tag :search, params[:search], placeholder: t(:label_search), autocomplete: "off" %>
|
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_vehicles), autocomplete: "off" %>
|
||||||
<%= submit_tag t(:label_search) %>
|
<%= submit_tag t(:label_search) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -14,9 +14,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
|
<h3><%=@open_issues.count%> <%=t(:label_open_issues)%></h3>
|
||||||
|
|
||||||
<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>
|
<%= render partial: 'issues/list_simple', locals: {issues: @open_issues} %>
|
||||||
|
|
||||||
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
|
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ async function handleCopy(event) {
|
|||||||
link = event.target;
|
link = event.target;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the text is already "Copied!", don't do anything
|
||||||
|
if (text == "Copied!") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Write to clipboard
|
// Write to clipboard
|
||||||
await navigator.clipboard.writeText(text);
|
await navigator.clipboard.writeText(text);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ en:
|
|||||||
label_model: "Model"
|
label_model: "Model"
|
||||||
label_new_vehicle: "New Customer Vehicle"
|
label_new_vehicle: "New Customer Vehicle"
|
||||||
label_no_vehicles: "There are no vehicles containing the term(s)"
|
label_no_vehicles: "There are no vehicles containing the term(s)"
|
||||||
label_search: "Search Vehicles"
|
label_search_vehicles: "Search Vehicles"
|
||||||
label_year: "Year"
|
label_year: "Year"
|
||||||
no_customer: "Customer no longer exists"
|
no_customer: "Customer no longer exists"
|
||||||
notice_vehicle_created: "Vehicle was successfully created."
|
notice_vehicle_created: "Vehicle was successfully created."
|
||||||
|
|||||||
17
db/migrate/003_add_timestamp.rb
Normal file
17
db/migrate/003_add_timestamp.rb
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
#The MIT License (MIT)
|
||||||
|
#
|
||||||
|
#Copyright (c) 2016 - 2026 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.
|
||||||
|
|
||||||
|
class AddTimestamp < ActiveRecord::Migration[7.0]
|
||||||
|
|
||||||
|
def change
|
||||||
|
add_timestamps(:vehicles, null: true)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
6
init.rb
6
init.rb
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
|
|||||||
name 'Redmine QBO Vehicles plugin'
|
name 'Redmine QBO Vehicles plugin'
|
||||||
author 'Rick Barrette'
|
author 'Rick Barrette'
|
||||||
description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking'
|
description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking'
|
||||||
version '2026.2.5'
|
version '2026.3.0'
|
||||||
url 'https://github.com/rickbarrette/redmine_qbo_vehicles'
|
url 'https://github.com/rickbarrette/redmine_qbo_vehicles'
|
||||||
author_url 'https://barrettefabrication.com'
|
author_url 'https://barrettefabrication.com'
|
||||||
requires_redmine version_or_higher: '6.1.0'
|
requires_redmine version_or_higher: '6.1.0'
|
||||||
@@ -35,6 +35,10 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
|
|||||||
# Register top menu items
|
# Register top menu items
|
||||||
menu :top_menu, :vehicles, { controller: :vehicles, action: :index }, caption: :field_vehicles, if: Proc.new { User.current.logged? }
|
menu :top_menu, :vehicles, { controller: :vehicles, action: :index }, caption: :field_vehicles, if: Proc.new { User.current.logged? }
|
||||||
|
|
||||||
|
Redmine::Search.map do |search|
|
||||||
|
search.register :vehicles
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Dynamically load all Hooks & Patches recursively
|
# Dynamically load all Hooks & Patches recursively
|
||||||
|
|||||||
@@ -17,13 +17,13 @@ module Vehicles
|
|||||||
|
|
||||||
# Called by Redmine QBO Invoice
|
# Called by Redmine QBO Invoice
|
||||||
def process_invoice_custom_fields(context={})
|
def process_invoice_custom_fields(context={})
|
||||||
Rails.logger.info "redmine_qbo_vehicles.process_invoice_custom_fields"
|
log "Processing invoice custom fields for invoice ##{context[:invoice].id}"
|
||||||
issue = context[:issue]
|
issue = context[:issue]
|
||||||
|
|
||||||
# update the invoive custom fields with infomation from the issue if available
|
# update the invoive custom fields with infomation from the issue if available
|
||||||
context[:invoice].custom_fields.each do |cf|
|
context[:invoice].custom_fields.each do |cf|
|
||||||
|
|
||||||
Rails.logger.info "Checking invoice.custom field: #{cf.name}"
|
log "Checking invoice custom field: #{cf.name}"
|
||||||
|
|
||||||
# VIN from the attached vehicle
|
# VIN from the attached vehicle
|
||||||
begin
|
begin
|
||||||
@@ -32,13 +32,13 @@ module Vehicles
|
|||||||
# TODO check cf_sync_confict flag once implemented
|
# TODO check cf_sync_confict flag once implemented
|
||||||
if cf.string_value.to_s.blank?
|
if cf.string_value.to_s.blank?
|
||||||
|
|
||||||
Rails.logger.info "VIN was blank, updating the invoice vin in quickbooks"
|
log "VIN was blank, updating the invoice vin in quickbooks"
|
||||||
vin = context[:issue].vehicle.vin
|
vin = context[:issue].vehicle.vin
|
||||||
break if vin.nil?
|
break if vin.nil?
|
||||||
|
|
||||||
if not cf.string_value.to_s.eql? vin
|
if not cf.string_value.to_s.eql? vin
|
||||||
cf.string_value = vin.to_s
|
cf.string_value = vin.to_s
|
||||||
Rails.logger.info "VIN has changed"
|
log "VIN has changed"
|
||||||
context[:is_changed] = true
|
context[:is_changed] = true
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ module Vehicles
|
|||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
#do nothing
|
#do nothing
|
||||||
Rails.logger.info "redmine_qbo_vehicles.process_invoice_custom_fields failed, skipping"
|
log "redmine_qbo_vehicles.process_invoice_custom_fields failed, skipping"
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -56,6 +56,12 @@ module Vehicles
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def log(msg)
|
||||||
|
Rails.logger.info "[InvoiceHookListener] #{msg}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user