Version 1.1.2

removed line items, payments, drop used db tables

app/controllers/customers_controller.rb

@@ -93,7 +93,7 @@ class CustomersController < ApplicationController
       @billing_address = address_to_s(@customer.billing_address)
       @shipping_address = address_to_s(@customer.shipping_address)
       @closed_issues = (@issues - @issues.open)
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -102,7 +102,7 @@ class CustomersController < ApplicationController
   def edit
     begin
       @customer = Customer.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -118,7 +118,7 @@ class CustomersController < ApplicationController
         redirect_to edit_customer_path
         flash[:error] = @customer.errors.full_messages.to_sentence if @customer.errors
       end
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -129,7 +129,7 @@ class CustomersController < ApplicationController
       Customer.find_by_id(params[:id]).destroy
       flash[:notice] = "Customer deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end

app/controllers/line_items_controler.rb

@@ -1,94 +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.
-
-# This controller class will handle map management
-class LineItemsController < ApplicationController
-  unloadable
-  
-  include AuthHelper
-  
-  before_action :require_user
-  
-  # display all line items for an issue
-  def index
-    if params[:issue_id]
-      begin
-        @line_items = Issue.find_by_id(params[:issue_id]).line_items
-      rescue ActiveRecord::RecordNotFound
-        render_404
-      end
-    end
-  end
-
-  # return an HTML form for creating a new line item
-  def new
-    @line_item = LineItem.new
-  end
-
-  # create a new line item
-  def create
-    @line_item = LineItem.new(params[:line_item])
-    if @line_item.save
-      flash[:notice] = "New Line Item Created"
-      redirect_to @line_item.issue
-    else
-      flash[:error] = @line_item.errors.full_messages.to_sentence 
-      redirect_to new_line_item_path
-    end
-  end
-  
-  # display a specific line item
-  def show
-    begin
-      @line_item = LineItem.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-  
-  # return an HTML form for editing a line item
-  def edit
-    begin
-      @line_item = LineItem.find_by_id(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-  
-  # update a specific line item
-  def update
-    begin   
-      @line_item = LineItem.find_by_id(params[:id])
-      if @line_item.update_attributes(params[:line_item])
-        flash[:notice] = "Line Item updated"
-        redirect_to @line_item
-      else
-        flash[:error] = @line_item.errors.full_messages.to_sentence if @line_item.errors
-        redirect_to edit_line_item_path
-      end
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end  
-
-  # delete a specific line item
-  def destroy
-    begin
-      line_item = LineItem.find_by_id(params[:id])
-      issue = line_item.issue
-      line_item.destroy
-      flash[:notice] = "Line Item deleted successfully"
-      redirect_to issue
-    rescue ActiveRecord::RecordNotFound
-      render_404
-    end
-  end
-
-end

app/controllers/payments_controller.rb

@@ -1,57 +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.
-class PaymentsController < ApplicationController
-  unloadable
-  
-  include AuthHelper
-  
-  before_action :check_permissions
-  
-  def new
-    @payment = Payment.new
-    
-    @customers = Customer.all.sort_by &:name
-    
-    @accounts = Qbo.get_base(:account).query("SELECT Id, Name FROM Account WHERE AccountType = 'Bank' Order By Name")
-    
-    @payment_methods = Qbo.get_base(:payment_method).all
-  end
-  
-  def create
-    @payment = Payment.new(params[:payment])
-    if @payment.save
-      flash[:notice] = "Payment Saved"
-      redirect_to Customer.find_by_id(@payment.customer_id)
-    else
-      flash[:error] = @payment.errors.full_messages.to_sentence 
-      redirect_to new_customer_path
-    end
-  end
-  
-  private
-
-  def check_permissions
-    if !allowed_to?(:add_payments)
-      render :file => "public/401.html.erb", :status => :unauthorized, :layout =>true 
-    end
-  end
-  
-  def only_one_non_zero?( array )
-    found_non_zero = false
-    array.each do |val|
-      if val!=0
-        return false if found_non_zero
-        found_non_zero = true
-      end
-    end
-    found_non_zero
-  end
-
-end

app/controllers/qbo_controller.rb

@@ -92,7 +92,7 @@ class QboController < ApplicationController
   # Quickbooks Webhook Callback
   def qbo_webhook
 
-    logger.debug "Quickbooks is calling webhook"
+    logger.info "Quickbooks is calling webhook"
     
     # check the payload
     signature = request.headers['intuit-signature']
@@ -149,14 +149,14 @@ class QboController < ApplicationController
       render nothing: true, status: 400
     end
 
-    logger.debug "Quickbooks webhook complete"
+    logger.info "Quickbooks webhook complete"
   end
 
   #
   # Synchronizes the QboCustomer table with QBO
   #
   def sync
-    logger.debug "Syncing EVERYTHING"
+    logger.info "Syncing EVERYTHING"
     # Update info in background
     Thread.new do
       if Qbo.exists?

app/controllers/vehicles_controller.rb

@@ -62,7 +62,9 @@ class VehiclesController < ApplicationController
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
       @vin = @vehicle.vin.scan(/.{1,9}/) if @vehicle.vin
-    rescue ActiveRecord::RecordNotFound
+      @issues = @vehicle.issues.order(id: :desc)
+      @closed_issues = (@issues - @issues.open)
+    rescue 
       render_404
     end
   end
@@ -72,7 +74,7 @@ class VehiclesController < ApplicationController
     begin
       @vehicle = Vehicle.find_by_id(params[:id])
       @customer = @vehicle.customer
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -90,7 +92,7 @@ class VehiclesController < ApplicationController
       end
       #show any errors anyways
       flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end
@@ -101,7 +103,7 @@ class VehiclesController < ApplicationController
       Vehicle.find_by_id(params[:id]).destroy
       flash[:notice] = "Vehicle deleted successfully"
       redirect_to action: :index
-    rescue ActiveRecord::RecordNotFound
+    rescue 
       render_404
     end
   end

app/models/qbo_estimate.rb

@@ -24,6 +24,7 @@ class QboEstimate < ActiveRecord::Base
   
   # sync all estimates
   def self.sync
+    logger.debug "Syncing ALL estimates"
     estimates = get_base.all
     estimates.each { |estimate|
       process_estimate(estimate)
@@ -35,6 +36,7 @@ class QboEstimate < ActiveRecord::Base
   
   # sync only one estimate
   def self.sync_by_id(id)
+    logger.debug "Syncing estimate #{id}"
     process_estimate(get_base.fetch_by_id(id))
   end
   
@@ -44,11 +46,13 @@ class QboEstimate < ActiveRecord::Base
     estimate = get_base.fetch_by_id(id)
     qbo_estimate = find_or_create_by(id: id)
     qbo_estimate.doc_number = estimate.doc_number
+    qbo_estimate.txn_date = estimate.txn_date
     qbo_estimate.save!
   end
   
   # process an estimate into the database
   def self.process_estimate(estimate)
+    logger.info "Processing estimate #{estimate.id}"
     qbo_estimate = find_or_create_by(id: estimate.id)
     qbo_estimate.doc_number = estimate.doc_number
     qbo_estimate.customer_id = estimate.customer_ref.value

app/models/qbo_invoice.rb

@@ -71,7 +71,7 @@ class QboInvoice < ActiveRecord::Base
   
   # processes the invoice into the database
   def self.process_invoice(invoice)
-    logger.debug "Processing invoice"
+    logger.info "Processing invoice #{invoice.id}"
 
     # Load the invoice into the database
     qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
@@ -104,6 +104,7 @@ class QboInvoice < ActiveRecord::Base
   # this condions causes an infinite loop as the webhook is called when an invoice is updated
   # TODO maybe add a cf_sync_confict flag to invoices
   def self.compare_custom_fields(issue, invoice)
+    logger.debug "Comparing custom fields"
     # TODO break if QboInvoice.find(invoice.id).cf_sync_confict
     is_changed = false
     
@@ -115,6 +116,10 @@ class QboInvoice < ActiveRecord::Base
       # TODO create hook for seperate plugin 
       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
@@ -122,6 +127,8 @@ class QboInvoice < ActiveRecord::Base
               logger.debug "VIN has changed"
               is_changed = true
             end
+
+          end
         end
       rescue
         #do nothing

app/models/qbo_item.rb

@@ -1,47 +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.
-
-class QboItem < ActiveRecord::Base
-  unloadable
-  has_many :issues
-  #attr_accessible :name
-  validates_presence_of :id, :name
-
-  self.primary_key = :id
-
-  def self.get_base
-    Qbo.get_base(:item)
-  end
-  
-  def self.sync 
-    last = Qbo.first.last_sync
-
-    query = "SELECT Id, Name FROM Item WHERE Type = 'Service' "
-    query << " AND  Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last 
-   
-    if count == 0
-      items = get_base.all
-    else
-      items = get_base.query(query)
-    end
-
-    unless items.count = 0
-      items.find_by(:type, "Service").each { |i|
-        qbo_item = QboItem.find_or_create_by(id: i.id)
-        qbo_item.name = i.name
-        qbo_item.id = i.id
-        qbo_item.save
-      }
-    end
-      
-#    QboItem.where.not(items.map(&:id)).destroy_all
-  end
-  
-end

app/models/qbo_purchase.rb

@@ -1,47 +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.
-
-class QboPurchase < ActiveRecord::Base
-  unloadable
-  belongs_to :issues
-  belongs_to :qbo_customer
-  #attr_accessible :description
-  validates_presence_of :id, :line_id, :description, :qbo_customer_id
-  
-  def self.get_base
-    Qbo.get_base(:purchase)
-  end
-
-  def get_purchase(id)
-    get_base.find_by_id(id)
-  end
-
-  def self.sync
-   QboPurchase.get_base.all.each { |purchase|
-      
-      purchase.line_items.all? { |line_item|
-        
-        detail = line_item.account_based_expense_line_detail ? line_item.account_based_expense_line_detail : line_item.item_based_expense_line_detail
-        
-        if detail.billable_status =  "Billable"
-            qbo_purchase = find_or_create_by(id: purchase.id)
-            qbo_purchase.line_id = line_item.id
-            qbo_purchase.description = line_item.description
-            qbo_purchase.qbo_customer_id = detail.customer_ref
-            
-            #TODO attach to issues
-            #qbo_purchase.issue_id = Issue.find_by_invoice()
-            
-            qbo_purchase.save
-        end
-      }
-    }
-  end
-end

app/models/vehicle.rb

@@ -15,12 +15,9 @@ class Vehicle < ActiveRecord::Base
   belongs_to :customer
   has_many :issues, :foreign_key => 'vehicles_id'
   
-  #attr_accessible :year, :make, :model, :customer_id, :notes, :vin
-  
   validates_presence_of :customer
   validates :vin, uniqueness: true
   before_save :decode_vin
-  #after_find :get_details
   
   self.primary_key = :id
   
@@ -34,35 +31,12 @@ class Vehicle < ActiveRecord::Base
     end
   end
   
-  # returns the raw JSON details from EMUNDS
+  # returns the raw JSON details from NHTSA
   def details
     get_details if @details.nil?
     return @details
   end
   
-  # returns the style of the vehicle
-  def style
-    get_details if @details.nil?
-    begin
-      return @details.trim if @details
-    rescue
-      return nil
-    end
-  end
-  
-  # returns the drive of the vehicle i.e. 2 wheel, 4 wheel, ect.
-  def drive
-    #todo fix this
-    #return @details.drive_type if @details
-    return nil
-  end
-  
-  # returns the number of doors of the vehicle
-  def doors
-    get_details if @details.nil?
-    return @details.doors if @details
-  end
-  
   # Force Upper Case for make numbers
   def make=(val)
     # The to_s is in case you get nil/non-string
@@ -75,9 +49,8 @@ class Vehicle < ActiveRecord::Base
     write_attribute(:model, val.to_s.titleize)
   end
   
-  # Force Upper Case for VIN numbers
+  # Force Upper Case & strip VIN of all illegal chars (for barcode scanner)
   def vin=(val)
-    #strip VIN of all illegal chars (for barcode scanner)
     val = val.to_s.upcase.gsub(/[^A-HJ-NPR-Za-hj-npr-z\d]+/,"")
     write_attribute(:vin, val)
   end
@@ -95,6 +68,8 @@ class Vehicle < ActiveRecord::Base
         self.year = @details.year unless @details.year.nil?
 	      self.make = @details.make unless @details.make.nil?
 	      self.model = @details.model unless @details.model.nil?
+        self.doors = @details.doors unless @details.doors.nil?
+        self.trim = @details.trim unless @details.trim.nil?
       rescue Exception => e
         errors.add(:vin, e.message)
       end
@@ -102,9 +77,9 @@ class Vehicle < ActiveRecord::Base
     self.name = to_s
   end
   
-private
+  private
   
-  # init method to pull JSON details from Edmunds
+  # init method to pull JSON details from NHTSA
   def get_details
     if self.vin?
       #validate the vin before calling a remote server

app/views/customers/_details.html.erb

@@ -34,11 +34,10 @@
       <th><%=t(:field_notes)%></th>
       <td><%= customer.notes %></td>
     </tr>
-    
-    <tr>
-      <td>
-        <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
-      </td>
-    </tr>
   </tbody>
 </table>
+<div style="float: right;">
+  <%= button_to t(:label_edit_customer), edit_customer_path(customer), method: :get%> 
+</div> 
+<br/>
+<br/>

app/views/customers/_form.html.erb

@@ -7,28 +7,28 @@
         <div class="clearfix">
           <%=t(:label_display_name)%> 
           <div class="input">
-            <%= f.text_field :name, :required => true %>
+            <%= f.text_field :name, :required => true, :autocomplete => "off"  %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_primary_phone)%>
           <div class="input">
-            <%= f.telephone_field :primary_phone %>
+            <%= f.telephone_field :primary_phone, :autocomplete => "off"  %>
           </div>
         </div>
         
        <div class="clearfix">
           <%=t(:label_mobile_phone)%>:
           <div class="input">
-            <%= f.telephone_field :mobile_phone %>
+            <%= f.telephone_field :mobile_phone, :autocomplete => "off"  %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_email)%>:
           <div class="input">
-            <%= f.email_field :email %>
+            <%= f.email_field :email, :autocomplete => "off"  %>
           </div>
         </div>
         

app/views/customers/_search.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag(customers_path, :method => "get", id: "search-form") do %>
-<%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
+    <%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
-<%= submit_tag t(:label_search) %>
+    <%= submit_tag t(:label_search) %>
 <% end %>
 <%= button_to t(:label_new_customer), new_customer_path, method: :get%>
-<%= button_to t(:label_sync), qbo_sync_path, method: :get%>
+<%= button_to(t(:label_sync), qbo_sync_path, method: :get) if User.current.admin?%>

app/views/customers/show.html.erb

@@ -1,15 +1,12 @@
 <h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2>
-  <br/>
+  <div class="issue">
-
-  <div class="subject">
-    <div><h4><%=t(:label_details)%>:</h4></div>
-  </div>
-
-  <div class="attributes">
 
     <div class="splitcontent">
 
       <div class="splitcontentleft">
+
+        <h4><%=t(:label_details)%>:</h4>
+
         <%= render :partial => 'customers/details', locals: {customer: @customer} %>
 
         <div class="splitcontent">
@@ -29,15 +26,17 @@
       <div class="splitcontentleft">
         <h4><%=t(:field_vehicles)%>:</h4>
         <%= render :partial => 'vehicles/list' %>
+        <div style="float: right;">
           <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
         </div>
       </div>
-
+    </div>
-    <br/>
-    <h2><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h2>
-    <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
-
-    <h2><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h2>
-    <%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
 
   </div>
+
+<br/>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
+
+<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h3>
+<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>

app/views/payments/_form.html.erb

@@ -1,42 +0,0 @@
-<div class="row">
-  <div class="span6 columns">
-    <fieldset>
-
-      <%= form_for @payment do |f| %> 
-       
-        <div class="clearfix">
-          <%=t(:field_customer)%>: 
-          <div class="input">
-            <%= f.collection_select :customer_id, @customers, :id, :name, include_blank: true, :selected => @customer, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_deposit_into)%>: 
-          <div class="input">
-            <%= f.collection_select :account_id, @accounts, :id, :name, include_blank: true, :selected => @account, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_payment_method)%>: 
-          <div class="input">
-            <%= f.collection_select :payment_method_id, @payment_methods, :id, :name, include_blank: true, :selected => @payment_method, :required => true%>
-          </div>
-        </div>
-        
-        <div class="clearfix">
-          <%=t(:label_amount)%>: 
-          <div class="input">
-            <%= f.number_field :total_amount %>
-          </div>
-        </div>
-        
-       <div class="actions">
-        <%= f.submit %>
-       </div>
-      <% end %>
-
-    </fieldset>
-  </div>
-</div>

app/views/payments/new.html.erb

@@ -1,3 +0,0 @@
-<h1><%=t(:label_new_payment)%></h1> 
-<br/>
-<%= render :partial => 'payments/form' %>

app/views/qbo/_sidebar.html.erb

@@ -1,2 +1,6 @@
-<%= render :partial => 'customers/sidebar' %>
+<% if User.current.logged? %>
-<%= render :partial => 'estimates/sidebar' %>
+
+    <%= render :partial => 'customers/sidebar' %>
+    <%= render :partial => 'estimates/sidebar' %>
+
+<% end %>

app/views/qbo/authenticate.html.erb

@@ -30,4 +30,3 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
         intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= authenticate_vendors_url %>'});
     </script>
   </body>
-

app/views/vehicles/_details.html.erb

@@ -1,4 +1,9 @@
-<table>
+<div class="issue">
+  <div class="splitcontent">
+    <div class="splitcontentleft">
+      <h4><%=t(:label_details)%>:</h4>
+      
+      <table>
         <tbody>
 
           <tr>
@@ -16,21 +21,25 @@
             <td><%= @vin[0] if @vin %><b><%=@vin[1] if @vin%></b></td>
           </tr>
           
-    <tr>
+          <th><%= t(:label_trim) %></th>
-      <th><%= t(:field_notes) %></th>
+            <td><%= vehicle.doors %> <%=t(:label_door) if vehicle.doors? %> <%= vehicle.trim %></td>
+          </tr>
+        </tbody>
+      </table>
+      
+    </div>
+
+    <div class="splitcontentleft">
+
+      <h4><%=t(:field_notes)%>:</h4>
         <td><%= vehicle.notes %></td>
       </tr>
 
-    <tr>
+    </div>
-        <th> <%= t(:issues) %> </th>
+  </div>
-        <td><%= vehicle.issues.count %></td>
+</div>
-    </tr>
 
-    <tr>
+<div style="float: right;">
-      <td>
   <%= button_to t(:label_edit), edit_vehicle_path(vehicle), method: :get%> 
   <%= button_to t(:label_delete), vehicle, method: :delete, data: {confirm: t(:warn_ru_sure)} %> 
-      </td>
+</div>
-    </tr>
-  </tbody>
-</table>

app/views/vehicles/_form.html.erb

@@ -14,21 +14,21 @@
         <div class="clearfix">
           <%=t(:label_year)%>: 
           <div class="input">
-            <%= f.number_field :year %>
+            <%= f.number_field :year, :autocomplete => "off"  %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_make)%>:
           <div class="input">
-            <%= f.text_field :make %>
+            <%= f.text_field :make, :autocomplete => "off"  %>
           </div>
         </div>
         
         <div class="clearfix">
           <%=t(:label_model)%>:
           <div class="input">
-            <%= f.text_field :model %>
+            <%= f.text_field :model, :autocomplete => "off"  %>
           </div>
         </div>
         

app/views/vehicles/_list.html.erb

@@ -11,7 +11,7 @@
         <br/>
         <%= vehicle.customer %>
         <br/>
-        <%= vehicle.vin %>
+        <%= vehicle.vin.scan(/.{1,9}/)[0] if vehicle.vin %><b><%=vehicle.vin.scan(/.{1,9}/)[1] if vehicle.vin%></b>
       </div>
     </div>
     <br/>

app/views/vehicles/_search.html.erb

@@ -1,4 +1,4 @@
 <%= form_tag(vehicles_path, :method => "get", id: "search-form") do %>
-  <%= text_field_tag :search, params[:search], placeholder: t(:label_seach_vin) %>
+  <%= text_field_tag :search, params[:search], placeholder: t(:label_search_vin), :autocomplete => "off"  %>
   <%= submit_tag t(:label_search) %>
 <% end %>

app/views/vehicles/show.html.erb

@@ -1,14 +1,11 @@
-<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
+<h2><%=t(:field_vehicle)%> #<%=@vehicle.id%></h2>
-<br/>
 
-<div style="text-align: left; width:90%;">
+<%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
-  <%= render :partial => 'vehicles/details', locals: {vehicle: @vehicle} %>
 
-  <p> <b> <%=t(:label_open_issues)%> </b>  </p>
+<h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
 
-  <%= render :partial => 'issues/list_simple', locals: {issues: @vehicle.issues.open} %>
+<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
 
-  <p> <b> <%=t(:label_closed_issues)%> </b> </p>
+<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
 
-  <%= render :partial => 'issues/list_simple', locals: {issues: (@vehicle.issues - @vehicle.issues.open)} %>
+<%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>
-</div>

config/locales/en.yml

@@ -77,3 +77,7 @@ en:
   label_no_estimates: "No Estimates"
   label_no_invoices: "No Invoices"
   label_invoices: "Invoices"
+  label_load_customer: "Load Customer"
+  label_door: "Door"
+  label_trim: "Trim"
+  

db/migrate/033_update_vehicles_trim.rb

@@ -8,27 +8,23 @@
 #
 #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 LineItem < ActiveRecord::Base
+class UpdateVehiclesTrim < ActiveRecord::Migration[5.1]
+  def change
+    add_column :vehicles, :doors, :text
+    add_column :vehicles, :trim, :text
 
-  unloadable
+    reversible do |direction|
+      direction.up {
 
-  belongs_to :issue
+        # Update local vehicle database by forcing a save, look at before_save
+        vehicles = Vehicle.all
+        vehicles.each { |vehicle|
+            vehicle.save!
+        }
 
-  #attr_accessible :amount, :description, :unit_price, :quantity, :item_id
+      }
-  validates_presence_of :amount, :description, :unit_price, :quantity
-  
-  def add_to_invoice(invoice)
-    line_item = Quickbooks::Model::InvoiceLineItem.new
-    line_item.amount = amount
-    line_item.description = description
-    line_item.sales_item! do |detail|
-      detail.unit_price = unit_price
-      detail.quantity = quantity
-      detail.item_id = item_id # Item ID here... Where do i get this???
     end
 
-    invoice.line_items << line_item
-    
-    return invoice
   end
+
 end

db/migrate/034_remove_qbo_items.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2020 rick barrette
+#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:
 #
@@ -8,30 +8,10 @@
 #
 #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 Payment
+class RemoveQboItems < ActiveRecord::Migration[5.1]
-  unloadable
+  def change
-  
+    drop_table :qbo_items
-  include ActiveModel::Model
+    drop_table :qbo_purchases
-  
+    drop_table :line_items
-  attr_accessor :errors, :customer_id, :account_id, :payment_method_id, :total_amount
-  validates_presence_of :customer_id, :account_id, :payment_method_id, :total_amount
-  validates :total_amount, numericality: true
-  
-  def save
-    payment = Quickbooks::Model::Payment.new
-    payment.customer_id = @customer_id.to_i
-    payment.deposit_to_account_id = @account_id.to_i
-    payment.payment_method_id = @payment_method_id.to_i
-    payment.total = @total_amount
-    Qbo.get_base(:payment).update(payment)
   end
-  
-  def save!
-    save
-  end
-
-  # Dummy stub to make validtions happy.
-  def update_attribute
-  end
-
 end

init.rb

@@ -8,36 +8,27 @@
 #
 #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.
 
+# Dynamically load all Hooks & Patches
+ActiveSupport::Reloader.to_prepare do
+  Dir::foreach(File.join(File.dirname(__FILE__), 'lib')) do |file|
+    next unless /\.rb$/ =~ file
+    require_dependency file
+  end
+end
+
 Redmine::Plugin.register :redmine_qbo do
   
-  # View Hook Listeners
-   require_dependency 'issues_form_hook_listener'
-   require_dependency 'issues_save_hook_listener'
-   require_dependency 'issues_show_hook_listener'
-   require_dependency 'users_show_hook_listener'
-   require_dependency 'header_footer_hook_listener'
-   require_dependency 'projects_form_hook_listener'
-   require_dependency 'view_hook_listener'
-
-   # Patches to the Redmine core.  Will not work in development mode
-    require_dependency 'issue_patch'
-    require_dependency 'project_patch'
-    require_dependency 'user_patch'
-    require_dependency 'query_patch'
-    require_dependency 'time_entry_query_patch'
-    require_dependency 'pdf_patch'
-    require_dependency 'attachments_controller_patch'
-
   # About
   name 'Redmine Quickbooks Online plugin'
   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'
-    version '1.1.0'
+  version '1.1.2'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'http://rickbarrette.org'
   settings :default => {'empty' => true}, :partial => 'qbo/settings'
+  requires_redmine :version_or_higher => '4.0.0'
   
-    # Add safe attributes
+  # Add safe attributes for core models
   Issue.safe_attributes 'customer_id'
   Issue.safe_attributes 'qbo_item_id'
   Issue.safe_attributes 'qbo_estimate_id'
@@ -61,7 +52,7 @@ Redmine::Plugin.register :redmine_qbo do
   permission :add_payments, :payments => :new, :public => false
   permission :view_vehicles, :payments => :new, :public => false
 
-    # Register QBO top menu item
+  # Register top menu items
   menu :top_menu, :customers, { :controller => :customers, :action => :index }, :caption => 'Customers', :if => Proc.new {User.current.logged?}
   menu :top_menu, :vehicles, { :controller => :vehicles, :action => :index }, :caption => 'Vehicles', :if => Proc.new { User.current.logged? }
     

lib/header_footer_hook_listener.rb

@@ -14,6 +14,6 @@ class HeaderFooterHookListener < Redmine::Hook::ViewListener
   end
 
   def view_layouts_base_body_bottom(context = {})
-    return "<div id='qbo_footer' align='center'><b>Last Sync: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
+    return "<div id='qbo_footer' align='center'><b>#{I18n.translate(:label_last_sync)}: </b> #{Qbo.last_sync if Qbo.exists?}</div>"
   end
 end

lib/issues_form_hook_listener.rb

@@ -1,6 +1,6 @@
 #The MIT License (MIT)
 #
-#Copyright (c) 2017 rick barrette
+#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:
 #
@@ -18,7 +18,7 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
   end
 
   # Edit Issue Form
-  # Show a dropdown for quickbooks contacts
+  # TODO figure out how to do this with a view
   def view_issues_form_details_bottom(context={})
     f = context[:form]
 
@@ -28,7 +28,7 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
       selected_vehicle = context[:project].vehicle ? context[:project].vehicle.id : nil
     end
 
-    # Check to see if there is a quickbooks user attached to the issue
+    # Check to see if there are things attached to the issue
     selected_customer =  context[:issue].customer ? context[:issue].customer.id  : nil
     selected_estimate =  context[:issue].qbo_estimate ? context[:issue].qbo_estimate.id  : nil
     selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
@@ -36,15 +36,22 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     # Load customer information
     customer = Customer.find_by_id(selected_customer) if selected_customer
 
+    # Customer Name Text Box with database backed autocomplete
     search_customer = f.autocomplete_field :customer,
       autocomplete_customer_name_customers_path,
       :selected => selected_customer,
-      :update_elements => { :id => '#issue_customer_id', :value => '#issue_customer' }
+      :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)",
+      :update_elements => { 
+        :id => '#issue_customer_id', 
+        :value => '#issue_customer' 
+      }
 
+    # Customer ID - Hidden Field
     customer_id = f.hidden_field :customer_id,
       :id => "issue_customer_id",
       :onchange => "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"
 
+    # Load estimates & vehicles
     if context[:issue].customer
       if customer.vehicles
         vehicles = customer.vehicles.pluck(:name, :id)
@@ -57,11 +64,10 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
       estimates = [nil].compact
     end
 
-     # Generate the drop down list of quickbooks extimates
+    # Generate the drop down list of quickbooks extimates & vehicles
     select_estimate = f.select :qbo_estimate_id, estimates, :selected => selected_estimate, include_blank: true
-
     vehicle = f.select :vehicles_id, vehicles, :selected => selected_vehicle, include_blank: true
 
-    return "<p><label for=\"issue_customer\">Customer</label>#{search_customer} #{customer_id}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
+    return "<p><label for=\"issue_customer\">Customer</label>#{search_customer} #{customer_id} #{link_to_function I18n.t(:label_load_customer), "updateIssueFrom('/issues/#{context[:issue].id}/edit.js', this)"}</p> <p>#{select_estimate}</p> <p>#{vehicle}</p>"
   end
 end

lib/projects_form_hook_listener.rb

@@ -32,5 +32,5 @@ class ProjectsFormHookListener < Redmine::Hook::ViewListener
     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>"
-end
+  end
 end

lib/query_patch.rb

@@ -16,7 +16,7 @@ module QueryPatch
   def available_columns
     unless @available_columns
       @available_columns = self.class.available_columns.dup
-      @available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
+      @available_columns << QueryColumn.new(:customer, :sortable => "#{Issue.table_name}.customer_id", :groupable => true, :caption => :field_customer)
       @available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.qbo_billed", :groupable => true, :caption => :field_qbo_billed)
     end
     super
@@ -24,7 +24,7 @@ module QueryPatch
   
   # Add customers to filters
   def initialize_available_filters
-    add_available_filter "customer", :type => :text
+    #add_available_filter "customer", :type => :text
     super
   end
 

lib/view_hook_listener.rb

@@ -1,3 +1,15 @@
+#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.
+
 class ViewHookListener < Redmine::Hook::ViewListener
+
   render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar"
+    
 end