Merge branch 'dev'

Alphabetized keys for better maintainability.

Fixed spelling errors in customer and vehicle keys/values.

Corrected "QuickBooks Online" branding.

app/models/vehicle.rb

@@ -15,7 +15,71 @@ class Vehicle < ActiveRecord::Base
   validates_presence_of :customer
   validates :vin, uniqueness: true
   before_save :decode_vin
+
+  def self.searchable_columns
+    ['vin', 'make', 'model', 'year']
+  end
+
+  def self.searchable_options
+    {
+      columns: searchable_columns,
+      scope: self.all
+    }
+  end
+
+  def self.search_result_ranks_and_ids(tokens, user, project = nil, options = {})
+    return {} if tokens.blank?
+
+    scope = self.all
+
+    tokens.each do |token|
+      q = "%#{sanitize_sql_like(token)}%"
+      scope = where("vin LIKE ? OR make LIKE ? OR model LIKE ? OR year LIKE ?", "%#{q}%", "%#{q}%", "%#{q}%", "%#{q}%") 
+    end
+
+    ids = scope.distinct.limit(options[:limit] || 100).pluck(:id)
+
+    # Assign simple uniform ranking
+    ids.each_with_object({}) { |id, h| h[id] = id }
+  end
+
+  def self.search_results_from_ids(ids, *args)
+    return [] if ids.blank?
+
+    Rails.logger.warn "IDS: #{ids.inspect}"
+
+    ids = ids.map(&:to_i)
+    records = where(id: ids).index_by(&:id)
+    ids.map { |id| records[id] }.compact
+  end
   
+  # ---- Redmine Search Event Interface ----
+  def event_type
+    'vehicle'
+  end
+
+  def event_title
+    to_s
+  end
+
+  def event_description
+    "#{vin} #{year} #{make} #{model}"
+  end
+
+  def event_url
+    Rails.application.routes.url_helpers.vehicle_path(self)
+  end
+
+  def event_datetime
+    updated_at || created_at
+  end
+
+  def project
+    # Vehicles are not project scoped in your schema.
+    # Return nil so global search works cleanly.
+    nil
+  end
+
   # returns a human readable string
   def to_s
     if year.nil? or make.nil? or model.nil?
@@ -50,9 +114,10 @@ class Vehicle < ActiveRecord::Base
     write_attribute(:vin, val)
   end
   
-  # search for a vin
+  # search for a vehicle by vin, make, model, or year
-  def self.search(search)
+  def self.search(query)
-    where("vin LIKE ?", "%#{search}%")
+    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

app/views/customers/_show_hook.html.erb

@@ -1,5 +1,5 @@
 <h4><%=t(:field_vehicles)%>:</h4>
-<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]) } %>
+<%= render partial: 'vehicles/list', locals: { vehicles: customer.vehicles.paginate(page: params[:page]), show_customer: false, show_checkbox: true } %>
 <div style="float: right;">
-    <%= button_to t(:button_new_vehice), new_customer_vehicle_path(customer), method: :get %>
+    <%= button_to t(:button_new_vehicle), new_customer_vehicle_path(customer), method: :get %>
 </div>

app/views/issues/_show_issue_view_right.html.erb

@@ -1,14 +1,17 @@
 <div class="vehicle attribute">
-    <div class="label"><span><%=t(:field_vehicle)%></span>:</div>
+    <div class="label"><%=t(:field_vehicle)%>:</div>
     <div class="value"><%= vehicle %></div>
 </div>
     
 <div class="vehicle_vin attribute">
-    <div class="label"><span><%=t(:field_vin)%></span>:</div>
+    <div class="label"><%=t(:field_vin)%>:</div>
-    <div class="value"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div>
+    <div class="value" id="vin">
+        <div id="copyLink" onclick="handleCopy(event)"><%=split_vin[0] if split_vin%><b><%=split_vin[1] if split_vin%></b></div>
+    </div>
+
 </div>
     
 <div class="vehicle_notes attribute">
-    <div class="label"><span><%=t(:field_notes)%></span>:</div>
+    <div class="label"><%=t(:field_notes)%>:</div>
     <pre class="value" id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit; "><%=notes%></pre>
 </div>

app/views/vehicles/_details.html.erb

@@ -18,7 +18,9 @@
           
           <tr>
             <th><%= t(:field_vin) %></th>
-            <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
+            <td>
+               <div onclick="handleCopy(event)"><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></div>
+            </td>
           </tr>
           
           <th><%= t(:label_trim) %></th>

app/views/vehicles/_list.html.erb

@@ -5,14 +5,22 @@
 
       <div class="container">
 
-        <%= check_box_tag "vehicle_ids[]", vehicle.id, false,  onchange: "updateLink()", data: { url: vehicle_path(vehicle).html_safe, text: vehicle.to_s }, class: "appointment checkbox" %>
+        <% if show_checkbox %>
-        
+          <%= check_box_tag "vehicle_ids[]", vehicle.id, false,  onchange: "updateLink()", data: { url: vehicle_path(vehicle).html_safe, text: vehicle.to_s }, class: "appointment checkbox" %>
+        <% else %>
+          <div class='checkbox'>
+          </div>
+        <% end %>
+
         <div class='label-main'>
           <%= link_to vehicle.to_s, vehicle_path(vehicle) %>
         </div>
 
         <div class="label-sub">
-          <%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
+          <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 %>
+            <%= vehicle.customer %>
+          <% end %>
         </div>
       
       </div>

app/views/vehicles/_search.html.erb

@@ -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_vin), autocomplete: "off" %>
+  <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vehicles), autocomplete: "off" %>
   <%= submit_tag t(:label_search) %>
 <% end %>

app/views/vehicles/index.html.erb

@@ -1,4 +1,4 @@
-<h2><%=t(:label_cusomer_vehicles)%> <span style="float:right"> <%= render partial: 'vehicles/search' %> </span> </h2> 
+<h2><%=t(:label_customer_vehicles)%> <span style="float:right"> <%= render partial: 'vehicles/search' %> </span> </h2> 
 <br/> 
 
-<%= render partial: 'vehicles/list', locals: {vehicles: @vehicles} %>
+<%= render partial: 'vehicles/list', locals: {vehicles: @vehicles, show_customer: true, show_checkbox: false} %>

assets/javascripts/copy.js

@@ -0,0 +1,40 @@
+async function handleCopy(event) {
+  console.log("Copy link clicked");
+  
+  let text;
+  let link;
+  // Grab the text from our clicked link
+  if(event.target.tagName.toLowerCase() === 'b'){
+    text = event.target.parentElement.innerText;
+    link = event.target.parentElement;
+  } else {
+    text = event.target.innerText;
+    link = event.target;
+  }
+
+  try {
+    // Write to clipboard
+    await navigator.clipboard.writeText(text);
+    
+    // Update the UI to show it worked
+    const originalText = link.innerText;
+    link.innerHTML = "<b>Copied!</b>";
+    link.style.color = "#4CAF50"; // Turn green
+
+    // Reset after 2 seconds
+    setTimeout(() => {
+      // Check if the text is long enough to prevent errors
+      if (originalText.length >= 8) {
+        const firstPart = originalText.slice(0, -8);
+        const lastEight = originalText.slice(-8);
+        link.innerHTML = `${firstPart}<b>${lastEight}</b>`;
+      } else {
+        link.innerText = originalText;
+      }
+      link.style.color = "";
+    }, 2000);
+
+  } catch (err) {
+    console.error('Unable to copy', err);
+  }
+}

config/locales/en.yml

@@ -10,27 +10,27 @@
 
 # English strings go here for Rails i18n
 # Usage I18n.t(:label)
+
 en:
-  field_vehicles: "Vehicles"
+  alert_no_customer: "Customer no longer exists, check for merged customers or deleted customers in QuickBooks Online."
-  field_vehicle: "Vehicle"
-  field_vin: "VIN"
-  label_edit: "Edit"
-  label_year: "Year"
-  label_make: " Make"
-  label_model: "Model"
-  label_no_vehicles: "There are no vehicles containing the term(s)"
-  label_search_vin: "Search Vehicles by VIN"
-  label_edit_customer_vehicle: "Edit Customer Vehicle"
-  label_cusomer_vehicles: "Customer Vehicles"
-  label_new_vehicle: "New Customer Vehicle"
-  button_new_vehice: "New Vehicle"
-  notice_vehicle_created: "Vehicle was successfully created."
-  notice_vehicle_updated: "Vehicle was successfully updated."
-  notice_vehicle_deleted: "Vehicle was successfully deleted."
-  alert_vehicle_not_found: "Vehicle not found."
-  alert_vehicle_not_deleted: "Vehicle could not be deleted."
   alert_vehicle_not_created: "Vehicle could not be created."
+  alert_vehicle_not_deleted: "Vehicle could not be deleted."
+  alert_vehicle_not_found: "Vehicle not found."
   alert_vehicle_not_updated: "Vehicle could not be updated."
+  button_new_vehicle: "New Vehicle"
+  field_vehicle: "Vehicle"
+  field_vehicles: "Vehicles"
+  field_vin: "VIN"
+  label_customer_vehicles: "Customer Vehicles"
+  label_edit: "Edit"
+  label_edit_customer_vehicle: "Edit Customer Vehicle"
+  label_make: "Make"
+  label_model: "Model"
+  label_new_vehicle: "New Customer Vehicle"
+  label_no_vehicles: "There are no vehicles containing the term(s)"
+  label_search_vehicles: "Search Vehicles"
+  label_year: "Year"
   no_customer: "Customer no longer exists"
-  alert_no_customer: "Customer no longer exists, check for merged customers or deleted customers in Quick Books Online."
+  notice_vehicle_created: "Vehicle was successfully created."
-  
+  notice_vehicle_deleted: "Vehicle was successfully deleted."
+  notice_vehicle_updated: "Vehicle was successfully updated."

db/migrate/003_add_timestamp.rb

@@ -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

init.rb

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
   name 'Redmine QBO Vehicles plugin'
   author 'Rick Barrette'
   description 'This is a plugin for Redmine to intergrate with the redmine_qbo plugin to provide vehicle data tracking'
-  version '2026.2.2'
+  version '2026.2.6'
   url 'https://github.com/rickbarrette/redmine_qbo_vehicles'
   author_url 'https://barrettefabrication.com'
   requires_redmine version_or_higher: '6.1.0'
@@ -35,6 +35,10 @@ Redmine::Plugin.register :redmine_qbo_vehicles do
   # Register top menu items
   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
 
 # Dynamically load all Hooks & Patches recursively

lib/vehicles/hooks/view_hook_listener.rb

@@ -14,7 +14,8 @@ module Vehicles
 
       def view_layouts_base_html_head(context = {})
         safe_join([
-          stylesheet_link_tag('style', plugin: :redmine_qbo_vehicles, media: :all)
+          stylesheet_link_tag('style', plugin: :redmine_qbo_vehicles, media: :all),
+          javascript_include_tag('copy', plugin: :redmine_qbo_vehicles)
         ])
       end