13 Commits
1.1.1 ... 1.1.2

Author SHA1 Message Date
7b5b673ebf Version 1.1.2 2022-03-06 18:20:30 -05:00
c72d0a83ca New line @ EOF & formating 2022-03-06 17:50:22 -05:00
3159289ac0 Removed unused code, only need to bill time
removed line items, payments, drop used db tables
2022-03-06 17:26:57 -05:00
a9cc5fac73 Removed unsed code & cleaned up comments 2022-03-06 17:05:04 -05:00
fe06fccacd Only show sync button if User is an admin 2022-03-06 16:49:07 -05:00
8b4a46f7eb H3 not H2 2022-03-06 16:27:39 -05:00
cf362caaf2 Cleaning up html formatting 2022-03-06 16:24:17 -05:00
de1be7d296 Make last 8 bold 2022-03-06 16:17:08 -05:00
d8e3e1a72f Styling & formatting 2022-03-06 13:46:55 -05:00
64a7ad844f Styling & formatting 2022-03-06 13:46:26 -05:00
9201c4ca96 render 404 on all exceptions 2022-03-06 09:23:05 -05:00
dab6b6f723 don't show doors if vehicle.doors is nil 2022-03-06 09:17:06 -05:00
495243d177 Add trim & doors to vehicle 2022-03-06 08:59:48 -05:00
24 changed files with 136 additions and 464 deletions

View File

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

View File

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

View File

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

View File

@@ -64,7 +64,7 @@ class VehiclesController < ApplicationController
@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.order(id: :desc)
@closed_issues = (@issues - @issues.open) @closed_issues = (@issues - @issues.open)
rescue ActiveRecord::RecordNotFound rescue
render_404 render_404
end end
end end
@@ -74,7 +74,7 @@ class VehiclesController < ApplicationController
begin begin
@vehicle = Vehicle.find_by_id(params[:id]) @vehicle = Vehicle.find_by_id(params[:id])
@customer = @vehicle.customer @customer = @vehicle.customer
rescue ActiveRecord::RecordNotFound rescue
render_404 render_404
end end
end end
@@ -92,7 +92,7 @@ class VehiclesController < ApplicationController
end end
#show any errors anyways #show any errors anyways
flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty? flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty?
rescue ActiveRecord::RecordNotFound rescue
render_404 render_404
end end
end end
@@ -103,7 +103,7 @@ class VehiclesController < ApplicationController
Vehicle.find_by_id(params[:id]).destroy Vehicle.find_by_id(params[:id]).destroy
flash[:notice] = "Vehicle deleted successfully" flash[:notice] = "Vehicle deleted successfully"
redirect_to action: :index redirect_to action: :index
rescue ActiveRecord::RecordNotFound rescue
render_404 render_404
end end
end end

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
<%= form_tag(customers_path, :method => "get", id: "search-form") do %> <%= 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 %> <% end %>
<%= button_to t(:label_new_customer), new_customer_path, method: :get%> <%= 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?%>

View File

@@ -1,15 +1,12 @@
<h2><%=t(:field_customer)%> #<%= @customer.id %> - <%= @customer.name %> </h2> <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="splitcontent">
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:label_details)%>:</h4>
<%= render :partial => 'customers/details', locals: {customer: @customer} %> <%= render :partial => 'customers/details', locals: {customer: @customer} %>
<div class="splitcontent"> <div class="splitcontent">
@@ -29,15 +26,17 @@
<div class="splitcontentleft"> <div class="splitcontentleft">
<h4><%=t(:field_vehicles)%>:</h4> <h4><%=t(:field_vehicles)%>:</h4>
<%= render :partial => 'vehicles/list' %> <%= render :partial => 'vehicles/list' %>
<div style="float: right;">
<%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %> <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>
</div> </div>
</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> </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} %>

View File

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

View File

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

View File

@@ -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 %>'}); intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= authenticate_vendors_url %>'});
</script> </script>
</body> </body>

View File

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

View File

@@ -11,7 +11,7 @@
<br/> <br/>
<%= vehicle.customer %> <%= vehicle.customer %>
<br/> <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>
</div> </div>
<br/> <br/>

View File

@@ -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><%=@issues.open.count%> <%=t(:label_open_issues)%> </b> </p> <h3><%=@issues.open.count%> <%=t(:label_open_issues)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %> <%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
<p><b><%=@closed_issues.count%> <%=t(:label_closed_issues)%> </b> </p> <h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %> <%= render :partial => 'issues/list_simple', locals: {issues: (@closed_issues)} %>
</div>

View File

@@ -78,3 +78,6 @@ en:
label_no_invoices: "No Invoices" label_no_invoices: "No Invoices"
label_invoices: "Invoices" label_invoices: "Invoices"
label_load_customer: "Load Customer" label_load_customer: "Load Customer"
label_door: "Door"
label_trim: "Trim"

View File

@@ -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. #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 end
invoice.line_items << line_item
return invoice
end end
end end

View File

@@ -1,6 +1,6 @@
#The MIT License (MIT) #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: #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. #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 end
def save!
save
end
# Dummy stub to make validtions happy.
def update_attribute
end
end end

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.1' version '1.1.2'
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'

View File

@@ -32,5 +32,5 @@ class ProjectsFormHookListener < Redmine::Hook::ViewListener
vehicle = f.select :vehicle_id, vehicles, :selected => selected_vehicle, include_blank: true 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> <p>#{vehicle}</p>"
end end
end end