144 Commits
0.4.0 ... 0.4.1

Author SHA1 Message Date
9dda339a32 Version Bump 0.4.1
* Various Bug Fixes
* Added a share button that creates a public view-able link for an issue that lasts 24 Hours
2016-09-15 07:32:38 -04:00
1098accc8a Bug Fix #2 2016-09-15 07:06:52 -04:00
12826cf436 Bug Fix #2 2016-09-15 07:05:19 -04:00
f9f77fdcb1 Bug Fix #2 2016-09-15 07:04:50 -04:00
0bc935d3dd Bug Fix #2 2016-09-15 07:03:54 -04:00
fc40e4a6fe Update README.md 2016-09-14 17:04:33 -04:00
99b658a03d Update qbo_invoice.rb 2016-09-14 16:49:54 -04:00
dacde1e050 Update qbo_invoice.rb 2016-09-14 14:34:50 -04:00
365219eddb Update issues_form_hook_listener.rb 2016-09-14 09:31:22 -04:00
bc4dbbadbb Update issues_form_hook_listener.rb 2016-09-14 09:30:07 -04:00
c06d2300f2 Update vehicles.js 2016-09-14 09:25:05 -04:00
5e34587a53 Update issues_form_hook_listener.rb 2016-09-14 09:24:04 -04:00
eb39b297f9 Update and rename vehicles.js.coffee to vehicles.js 2016-09-14 09:23:38 -04:00
798a7c9933 Update issues_form_hook_listener.rb 2016-09-14 09:00:23 -04:00
9dee336e76 Rename update_vehicles.coffee.js to update_vehicles.js.coffee 2016-09-14 08:59:22 -04:00
9ba43d63b9 Rename vehicles.coffee.js to vehicles.js.coffee 2016-09-14 08:59:05 -04:00
8126671df9 Update vehicles.coffee.js 2016-09-14 08:54:29 -04:00
3f0ccd79f3 Update vehicles.coffee.js 2016-09-14 08:47:56 -04:00
e61023acd5 Update issues_form_hook_listener.rb 2016-09-14 08:43:05 -04:00
35c2e7a951 Update issues_form_hook_listener.rb 2016-09-14 08:42:11 -04:00
81e8a9594f Update issues_form_hook_listener.rb 2016-09-14 08:40:10 -04:00
63415f8e58 Delete autocomplete.js 2016-09-14 08:37:15 -04:00
ed9b1ea7b9 Update issues_form_hook_listener.rb 2016-09-14 08:36:54 -04:00
6026f9cdfc Update issues_form_hook_listener.rb 2016-09-14 08:31:30 -04:00
1924156a8c Rename vehicles.js.coffee to vehicles.coffee.js 2016-09-14 08:30:19 -04:00
3927b2b007 Rename update_vehicles.js.coffee to update_vehicles.coffee.js 2016-09-14 08:29:54 -04:00
7a2e984df7 Update issues_form_hook_listener.rb 2016-09-14 00:31:06 -04:00
2c9559104a Update issues_form_hook_listener.rb 2016-09-14 00:10:40 -04:00
07e342845a Update Gemfile 2016-09-14 00:04:46 -04:00
dbab5bfbca Update issues_form_hook_listener.rb 2016-09-13 23:58:32 -04:00
cc70c95115 Create update_vehicles.js.coffee 2016-09-13 23:57:12 -04:00
03bcff2b9a Create vehicles.js.coffee 2016-09-13 23:55:54 -04:00
9c4ed3d9e1 Update vehicles_controller.rb 2016-09-13 23:43:06 -04:00
8156657eb2 Update issues_show_hook_listener.rb 2016-09-13 23:37:27 -04:00
c2ffedc8de Update issues_show_hook_listener.rb 2016-09-13 23:33:48 -04:00
3600c3e80a Update issues_show_hook_listener.rb 2016-09-13 23:32:45 -04:00
2970bd092c Update issues_show_hook_listener.rb 2016-09-13 23:28:36 -04:00
a2cac188bb Update issues_show_hook_listener.rb 2016-09-13 23:26:37 -04:00
e542f098a8 Update issues_show_hook_listener.rb 2016-09-13 23:24:34 -04:00
04a1670ac2 Update qbo_invoice.rb 2016-09-13 23:17:51 -04:00
c189bc5dca Update qbo_invoice.rb 2016-09-13 23:14:18 -04:00
4b7cf407e8 Update qbo_invoice.rb 2016-09-13 22:57:45 -04:00
332deed21e Update qbo_invoice.rb 2016-09-13 22:56:36 -04:00
41313029cd Update qbo_invoice.rb 2016-09-13 22:54:52 -04:00
bbc3b138cf Update qbo_invoice.rb 2016-09-13 22:48:11 -04:00
e4d5770bdc Update qbo_invoice.rb 2016-09-13 22:44:12 -04:00
53a0a47dd6 Update qbo_invoice.rb 2016-09-13 22:41:51 -04:00
48edc85e2c Update qbo_invoice.rb 2016-09-13 22:39:25 -04:00
c685aaa245 Update qbo_invoice.rb 2016-09-13 22:30:52 -04:00
2a79389b18 Update qbo_invoice.rb 2016-09-13 22:23:36 -04:00
c3e4d0dbc2 Update invoice_controller.rb 2016-09-06 23:33:39 -04:00
89123fed31 Update header_footer_hook_listener.rb 2016-09-06 23:05:24 -04:00
571811ace6 Update header_footer_hook_listener.rb 2016-09-06 23:01:26 -04:00
cb24967713 Update qbo_invoice.rb 2016-09-06 19:09:59 -04:00
449a59188c Update qbo_invoice.rb 2016-09-06 19:02:32 -04:00
907448ce3e Update qbo_invoice.rb 2016-09-06 19:01:27 -04:00
4f08af3987 Update _form.html.erb 2016-09-06 11:00:07 -05:00
00285e1f24 Update vehicle.rb 2016-09-06 10:56:30 -05:00
5b56d7a878 Update customers_controller.rb 2016-09-05 20:40:32 -04:00
5c0d1def9f Update customers_controller.rb 2016-09-05 20:35:10 -04:00
fc3e252fff Update customers_controller.rb 2016-09-05 20:33:27 -04:00
d605f617e4 Update issues_show_hook_listener.rb 2016-09-05 19:58:40 -04:00
eb390e09d8 Update issues_show_hook_listener.rb 2016-09-05 19:57:17 -04:00
bde29ef9d0 Update issue_patch.rb 2016-09-05 19:54:13 -04:00
5ffc9ed01c Update issue_patch.rb 2016-09-05 19:53:06 -04:00
c992370962 Update issues_show_hook_listener.rb 2016-09-05 19:49:17 -04:00
b3acf9f29d Update customers_controller.rb 2016-09-05 19:27:03 -04:00
dca3735ce1 Update customers_controller.rb 2016-09-05 19:25:32 -04:00
c7a5c1147f Update customers_controller.rb 2016-09-03 23:50:24 -04:00
8940e72091 Update customers_controller.rb 2016-09-03 23:48:54 -04:00
1ed7c6fe63 Update customers_controller.rb 2016-09-03 23:47:05 -04:00
a197dcdefc Update README.md 2016-09-03 23:31:11 -04:00
e00f73a48d Update en.yml 2016-09-03 09:53:26 -04:00
1c977a6687 Update query_patch.rb 2016-09-03 09:37:27 -04:00
b3e93bb465 Update time_entry_query_patch.rb 2016-09-03 09:35:23 -04:00
628c798238 Update init.rb 2016-09-03 09:34:17 -04:00
b34bd9dd7c Update en.yml 2016-09-03 09:32:09 -04:00
4d40093fe9 Update time_entry_query_patch.rb 2016-09-03 09:31:38 -04:00
e573da2c11 Update init.rb 2016-09-03 09:30:52 -04:00
f47316efbe Create time_entry_query_patch.rb 2016-09-03 09:28:51 -04:00
f57c3c3df0 Update issue_patch.rb 2016-09-03 09:17:55 -04:00
9b91e4fd63 Update issue_patch.rb 2016-09-03 09:16:13 -04:00
a264e707a8 Update issue_patch.rb 2016-09-03 09:15:37 -04:00
a75a784e8d Update customers_controller.rb 2016-09-03 09:06:52 -04:00
1e04b6ae9f Update view.html.erb 2016-09-02 11:40:18 -04:00
6dfbfccced Update view.html.erb 2016-09-02 11:38:13 -04:00
27288c2eb2 Update view.html.erb 2016-09-02 11:36:59 -04:00
53a1be9761 Update view.html.erb 2016-09-02 11:28:06 -04:00
d1c6492ea3 Update view.html.erb 2016-09-02 11:26:51 -04:00
0f72d88c71 Update customers_controller.rb 2016-09-02 11:22:05 -04:00
9edfcecdaa Update customers_controller.rb 2016-09-02 11:20:31 -04:00
5303b3dfef Update view.html.erb 2016-09-02 11:18:42 -04:00
1213c2e57a Update view.html.erb 2016-09-02 11:17:54 -04:00
49ca69aa78 Update view.html.erb 2016-09-02 11:17:22 -04:00
586f7c8fb9 Update view.html.erb 2016-09-02 11:16:40 -04:00
7a68fcfa92 Update customers_controller.rb 2016-09-02 11:15:18 -04:00
357e5d4490 Update customers_controller.rb 2016-09-02 11:14:01 -04:00
af25326c23 Update view.html.erb 2016-09-02 11:09:12 -04:00
e1db312982 Update view.html.erb 2016-09-02 11:04:46 -04:00
59a418727e Update view.html.erb 2016-09-02 11:04:36 -04:00
c3d9833acb Update view.html.erb 2016-09-02 11:03:48 -04:00
59ebeb48ce Update view.html.erb 2016-09-02 11:03:10 -04:00
7bd23e993e Update view.html.erb 2016-09-02 11:01:54 -04:00
9b15f3f4f6 Update view.html.erb 2016-09-02 11:00:40 -04:00
f087d3c6c0 Update view.html.erb 2016-09-02 10:59:55 -04:00
806b4719fe Update customers_controller.rb 2016-09-02 10:54:58 -04:00
126f4abe0a Update customer_token.rb 2016-09-02 10:52:19 -04:00
5ec76737b3 Update customer_token.rb 2016-09-02 10:50:32 -04:00
1d7bcc24fe Update issue_patch.rb 2016-09-02 10:46:37 -04:00
76a6fce406 Update customer_token.rb 2016-09-02 10:43:50 -04:00
3d44bcb04d Update customers_controller.rb 2016-09-02 10:40:15 -04:00
fd8b5c280c Create view.html.erb 2016-09-02 10:39:43 -04:00
ef6f104d5f Update customers_controller.rb 2016-09-02 10:34:51 -04:00
92538a58e3 Update customers_controller.rb 2016-09-02 10:34:09 -04:00
44bc2f47f1 Update customers_controller.rb 2016-09-02 10:32:58 -04:00
3c9316340f Update routes.rb 2016-09-02 10:31:05 -04:00
3ef9236388 Update customers_controller.rb 2016-09-02 10:29:48 -04:00
dfdde631f9 Update routes.rb 2016-09-02 10:29:26 -04:00
372a6a1b6a Update auth_helper.rb 2016-09-02 10:28:17 -04:00
5a4996abac Update qbo_controller.rb 2016-09-02 10:10:55 -04:00
416df8d3f1 Update auth_helper.rb 2016-09-02 00:29:47 -04:00
0aa7fe8e73 Update auth_helper.rb 2016-09-02 00:25:32 -04:00
f14e82a01b Update auth_helper.rb 2016-09-02 00:24:59 -04:00
5a10065bb0 Update auth_helper.rb 2016-09-02 00:23:49 -04:00
fb801e9260 Update auth_helper.rb 2016-09-02 00:21:52 -04:00
0fa31f815e Update auth_helper.rb 2016-09-02 00:11:01 -04:00
76bd0d4e08 Update customer_token.rb 2016-09-02 00:04:33 -04:00
b31c3ad550 Update customer_token.rb 2016-09-02 00:02:39 -04:00
af7c1b0130 Update customer_token.rb 2016-09-02 00:00:48 -04:00
224b0b4238 Update 023_create_customer_tokens.rb 2016-09-01 23:57:24 -04:00
e6fee6bd97 Update customer_token.rb 2016-09-01 23:52:39 -04:00
731b811cfe Update customer_token.rb 2016-09-01 23:48:48 -04:00
63d969c844 Added Customer Token Model 2016-09-01 23:45:51 -04:00
1138b0d5c9 Rename 21_add_issues_qbo_invoices.rb to 021_add_issues_qbo_invoices.rb 2016-09-01 23:37:07 -04:00
758810135d Rename 20_update_qbos_time_stamp.rb to 020_update_qbos_time_stamp.rb 2016-09-01 23:36:53 -04:00
6eff61b19d Create 022_update_issues_remove_invoice.rb 2016-09-01 23:36:40 -04:00
b3bc17f327 Update Gemfile 2016-09-01 23:30:58 -04:00
67d4ac0ebf Update init.rb 2016-09-01 23:30:25 -04:00
11d3a2d0bf Update init.rb 2016-09-01 23:28:34 -04:00
1f76333af7 Update init.rb 2016-09-01 23:27:26 -04:00
816daeb429 Update init.rb 2016-09-01 23:24:28 -04:00
b1bc19fb7a Update init.rb 2016-09-01 23:23:20 -04:00
578258f9e2 Update Gemfile 2016-09-01 23:19:14 -04:00
41fe8f6a5d Update issues_show_hook_listener.rb 2016-09-01 12:13:06 -04:00
31 changed files with 441 additions and 94 deletions

View File

@@ -7,4 +7,7 @@ gem 'oauth'
gem 'roxml'
gem 'edmunds_vin'
gem 'will_paginate', '~> 3.1.0'
gem 'rails4-autocomplete'
group :assets do
gem 'coffee-rails'
end

View File

@@ -6,23 +6,22 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
`Note: Although the core functionality is complete, this project is still under heavy development. I am still working on refining everthing and adding other features. Tags should be stable`
`Note: I am currently using this in a live production enviroment with no issues`
####Features
* Issues can be assigned to a `Customer` via drop down in the edit Issue form
* The `Employee` for the Issue is assigned via the assigned Redmine User
- This is set via a drop down in the user admistration page.
* IF an `Issue` has been assined a `Customer` when an Issue is closed the following will happen:
- A new `Time Activity` will be created for the `Customer` assinged to the issue for each Redmine Time Entery.
- A new `Time Activity` will be billed agaist the `Customer` assinged to the issue for each Redmine Time Entery.
+ Time Entries will be totalled up by Activity name. This will allow billing for diffrent activities without having to create seperate Issues.
+ The Time Activity names are used to lookup `Items` in Quickbooks.
+ IF there isn'tany Items that match the Activity name it will be skipped, and will not be billed to the `Customer`
- Labor Rates are set by the `Item` in Quickbooks
* `Issues` with the Tracker `Quote` will generate an estimate based on the estimated hours and `Item` rates.
- Needs to have a `Customer` Assiged
* `Payments` Can be created via the Redmine application menu
* `Customers` Can be created via the Redmine application menu
* `Customers` can be searched
* Basic information for the `Customer` can be viewed via the customer page
* `Custmoer` information can be update
- `Customers` can be searched
- Basic information for the `Customer` can be viewed/edit via the Customer page
* Webhook Support
- `Invoices` are automaticly attached to an Issue if a line item has a hashtag number in a `Line Item`
+ `Invoice` Custom Fields are matched Issue Custom Fileds and are automaticly updated in Quickbooks. For example, this is usefull for extracting the Mileage In / Out from the Issue and updating the Invoice with the information.
@@ -47,19 +46,18 @@ The goal of this project is to allow Redmine to connect with Quickbooks Online t
3. Navigate to the plugin configuration page and suppy your own OAuth key & secret.
![Alt plugin_config](/Screenshots/plugin_config.png)
4. After saving your key & secret, you need to click on the Authenticate link on the plugin configuration page to authenticate with QBO.
5. Assign an Employee to each of your users via the User Administration Page
![Alt plugin_user_edit](/Screenshots/plugin_user_edit.png)
## Automatic Deploy
If you want the redmine server to be automaticly restarted after a git pull event add this hook to your git hook directory
https://gist.github.com/rickbarrette/3c999c7f37e321f9c60380de99e494f5
## Usage
To enable automatic `Time Activity` entries for an Issue , you need only to assign a `Customer` to an Issue via drop downs in the issue creation/update form.
![Alt plugin_issue-edit](/Screenshots/plugin_issue_edit.png)
Note: After the inital synchronization, this plugin will recieve push notifications via Intuit's webhook service.
@@ -67,10 +65,8 @@ Note: After the inital synchronization, this plugin will recieve push notificati
* Abiltiy to add line items to a ticket in a dynamic table so they can be added to the invoice upon closing of the issue
* Customer Deletion
* Email Customer updates, provding a link that would: bypass the login page, go directly to the issue directing them to, and allow them to view only that issue.
* Add a rake file to create required Trackers or statuses required
* Add Setting for Sandbox Mode
* Refactor Models prefixed with Qbo...
* Allow multiple Invoices to be attached to an Issue
* Seperate Vehicles into a seperate plugin
* Make HTML Pretty
* Intergrate Customer Search into Redmine Search

View File

@@ -13,8 +13,22 @@ class CustomersController < ApplicationController
unloadable
include AuthHelper
helper :issues
helper :journals
helper :projects
helper :custom_fields
helper :issue_relations
helper :watchers
helper :attachments
helper :queries
include QueriesHelper
helper :repositories
helper :sort
include SortHelper
helper :timelog
before_filter :require_user
before_filter :require_user, :except => :view
skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:view]
default_search_scope :names
@@ -89,6 +103,34 @@ class CustomersController < ApplicationController
end
end
# Customer view for an issue
def view
token = CustomerToken.where("token = ? and expires_at > ?", params[:token], Time.now)
if token.first
@issue = Issue.find token.first.issue_id
@journals = @issue.journals.
preload(:details).
preload(:user => :email_address).
reorder(:created_on, :id).to_a
@journals.each_with_index {|j,i| j.indice = i+1}
@journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
Journal.preload_journals_details_custom_fields(@journals)
@journals.select! {|journal| journal.notes? || journal.visible_details.any?}
@journals.reverse! if User.current.wants_comments_in_reverse_order?
@changesets = @issue.changesets.visible.preload(:repository, :user).to_a
@changesets.reverse! if User.current.wants_comments_in_reverse_order?
@relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@priorities = IssuePriority.active
@time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
@relation = IssueRelation.new
else
render_403
end
end
private
def only_one_non_zero?( array )

View File

@@ -18,7 +18,7 @@ class InvoiceController < ApplicationController
# Downloads and forwards the invoice pdf
#
def show
base = QboInvoice.get_base.service
base = QboInvoice.get_base
invoice = base.fetch_by_id(params[:id])
@pdf = base.pdf(invoice)
send_data @pdf, filename: "invoice #{invoice.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"

View File

@@ -16,7 +16,7 @@ class QboController < ApplicationController
include AuthHelper
before_filter :require_user, :except => :qbo_webhook
skip_before_filter :verify_authenticity_token, :check_if_login_required
skip_before_filter :verify_authenticity_token, :check_if_login_required, :only => [:qbo_webhook]
#
# Called when the QBO Top Menu us shown

View File

@@ -103,7 +103,7 @@ class VehiclesController < ApplicationController
# returns a dynamic list of vehicles owned by a customer
def update_vehicles
@vehicles = Customer.find_by_id(params[:customer_id].to_i).vehicles
@vehicles = Customer.find_by(customer_id: params[:customer_id].to_i).vehicles
respond_to do |format|
format.html { render(:text => "not implemented") }
format.js

View File

@@ -0,0 +1,23 @@
#The MIT License (MIT)
#
#Copyright (c) 2016 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 CustomerToken < ActiveRecord::Base
unloadable
has_many :issues
attr_accessible :token, :expires_at, :issue_id
validates_presence_of :expires_at, :issue_id
before_create :generate_token
OAUTH_CONSUMER_SECRET = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret']
def generate_token
self.token = SecureRandom.base64(15).tr('+/=lIO0', OAUTH_CONSUMER_SECRET)
end
end

View File

@@ -12,14 +12,15 @@ class QboInvoice < ActiveRecord::Base
unloadable
has_and_belongs_to_many :issues
attr_accessible :doc_number
validates_presence_of :doc_number
attr_accessible :doc_number, :id
validates_presence_of :doc_number, :id
self.primary_key = :id
def self.get_base
Qbo.get_base(:invoice)
Qbo.get_base(:invoice).service
end
# sync ALL the invoices
def self.sync
last = Qbo.first.last_sync
@@ -27,25 +28,27 @@ class QboInvoice < ActiveRecord::Base
query << " WHERE Metadata.LastUpdatedTime >= '#{last.iso8601}' " if last
if count == 0
invoices = get_base.service.all
invoices = get_base.all
else
invoices = get_base.service.query()
invoices = get_base.query()
end
# Update the invoice table
invoices.each { | invoice |
sync_by_id invoice.id
process_invoice invoice
}
end
#sync by invoice ID
def self.sync_by_id(id)
#update the information in the database
invoice = Qbo.get_base(:invoice).service.fetch_by_id(id)
qbo_invoice = find_or_create_by(id: invoice.id)
qbo_invoice.doc_number = invoice.doc_number
qbo_invoice.id = invoice.id
qbo_invoice.save!
invoice = get_base.fetch_by_id(id)
process_invoice invoice
end
# processes the invoice into the system
def self.process_invoice(invoice)
is_changed = false
# Scan the line items for hashtags and attach to the applicable issues
@@ -53,22 +56,32 @@ class QboInvoice < ActiveRecord::Base
if line.description
line.description.scan(/#(\w+)/).flatten.each { |issue|
i = Issue.find_by_id(issue.to_i)
begin
i.qbo_invoices << QboInvoice.find_by_id(invoice.id.to_i)
# Load the invoice into the database
qbo_invoice = QboInvoice.find_or_create_by(id: invoice.id)
qbo_invoice.doc_number = invoice.doc_number
qbo_invoice.id = invoice.id
qbo_invoice.save!
# Attach the invoice to the issue
unless i.qbo_invoices.include?(qbo_invoice)
i.qbo_invoices << qbo_invoice
i.save!
rescue
# do nothing, the reccord exists
end
# update the invoive custom fields with infomation from the work ticket if available
invoice.custom_fields.each { |cf|
# VIN
# VIN from the attached vehicle
begin
if cf.name.eql? "VIN"
vin = Vehicle.find(i.vehicles_id).vin
break if vin.blank?
cf.string_value = vin if not cf.string_value.to_s.eql? vin
break
break if vin.nil?
if not cf.string_value.to_s.eql? vin
cf.string_value = vin.to_s
is_changed = true
break
end
end
rescue
#do nothing
@@ -77,8 +90,31 @@ class QboInvoice < ActiveRecord::Base
# Custom Values
begin
value = i.custom_values.find_by(custom_field_id: CustomField.find_by_name(cf.name).id)
# Check to see if the value is blank...
if not value.value.to_s.blank?
# Check to see if the value is diffrent
if not cf.string_value.to_s.eql? value.value.to_s
# Use the lowest Milage
if cf.name.eql? "Mileage In"
if cf.string_value.to_i > value.value.to_i or cf.string_value.blank?
cf.string_value = value.value.to_s
is_changed = true
end
break
end
# Use the max milage
if cf.name.eql? "Mileage Out"
if cf.string_value.to_i < value.value.to_i or cf.string_value.blank?
cf.string_value = value.value.to_s
is_changed = true
end
break
end
# Everything else
cf.string_value = value.value.to_s
is_changed = true
end
@@ -87,17 +123,12 @@ class QboInvoice < ActiveRecord::Base
# Nothing to do here, there is no match
end
}
# Push updates
Qbo.get_base(:invoice).service.update(invoice) if is_changed
}
end
}
# Push updates
get_base.update(invoice) if is_changed
end
def self.update(id)
invoice = get_base.service.fetch_by_id(id)
qbo_invoice = find_or_create_by(id: id)
qbo_invoice.doc_number = invoice.doc_number
qbo_invoice.save!
end
end

View File

@@ -87,8 +87,8 @@ class Vehicle < ActiveRecord::Base
if self.vin?
begin
@details = JSON.parse get_decoder.full(self.vin)
raise @details['message'] if @details['status'] == "NOT_FOUND"
raise @details['message'] if @details['status'] == "BAD_REQUEST"
raise @details['message'] if @details['status'].to_s.eql? "NOT_FOUND"
raise @details['message'] if @details['status'].to_s.eql? "BAD_REQUEST"
rescue Exception => e
errors.add(:vin, e.message)
end

View File

@@ -24,5 +24,5 @@
<% end %>
<div>
<%= Customer.count %> Customers - <b>Last Sync: </b> <%= Qbo.last_sync %>
<%= Customer.count %> Customers - <b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
</div>

View File

@@ -0,0 +1,108 @@
<h2><%= issue_heading(@issue) %></h2>
<div class="<%= @issue.css_classes %> details">
<%= avatar(@issue.author, :size => "50") %>
<div class="subject">
<%= render_issue_subject_with_tree(@issue) %>
</div>
<p class="author">
<%= authoring @issue.created_on, @issue.author %>.
<% if @issue.created_on != @issue.updated_on %>
<%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
<% end %>
</p>
<div class="attributes">
<%= issue_fields_rows do |rows|
rows.left l(:field_status), @issue.status.name, :class => 'status'
rows.left l(:field_priority), @issue.priority.name, :class => 'priority'
unless @issue.disabled_core_fields.include?('assigned_to_id')
rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
end
unless @issue.disabled_core_fields.include?('category_id') || (@issue.category.nil? && @issue.project.issue_categories.none?)
rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category'
end
unless @issue.disabled_core_fields.include?('fixed_version_id') || (@issue.fixed_version.nil? && @issue.assignable_versions.none?)
rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
end
unless @issue.disabled_core_fields.include?('start_date')
rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
end
unless @issue.disabled_core_fields.include?('due_date')
rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
end
unless @issue.disabled_core_fields.include?('done_ratio')
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :legend => "#{@issue.done_ratio}%"), :class => 'progress'
end
unless @issue.disabled_core_fields.include?('estimated_hours')
if @issue.estimated_hours.present? || @issue.total_estimated_hours.to_f > 0
rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
end
end
if User.current.allowed_to_view_all_time_entries?(@project)
if @issue.total_spent_hours > 0
rows.right l(:label_spent_time), issue_spent_hours_details(@issue), :class => 'spent-time'
end
end
end %>
<%= render_custom_fields_rows(@issue) %>
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
</div>
<% if @issue.description? || @issue.attachments.any? -%>
<hr />
<% if @issue.description? %>
<div class="description">
<div class="contextual">
<%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if @issue.notes_addable? %>
</div>
<p><strong><%=l(:field_description)%></strong></p>
<div class="wiki">
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
</div>
</div>
<% end %>
<%= link_to_attachments @issue, :thumbnails => true %>
<% end -%>
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
<hr />
<div id="issue_tree">
<div class="contextual">
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
</div>
<p><strong><%=l(:label_subtask_plural)%></strong></p>
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
</div>
<% end %>
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
<hr />
<div id="relations">
<%= render :partial => 'issues/relations' %>
</div>
<% end %>
</div>
<% if @changesets.present? %>
<div id="issue-changesets">
<h3><%=l(:label_associated_revisions)%></h3>
<%= render :partial => 'issues/changesets', :locals => { :changesets => @changesets} %>
</div>
<% end %>
<% if @journals.present? %>
<div id="history">
<h3><%=l(:label_history)%></h3>
<%= render :partial => 'issues/history', :locals => { :issue => @issue, :journals => @journals } %>
</div>
<% end %>
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>

View File

@@ -103,5 +103,5 @@ Note: You need to authenticate after saving your key and secret above
<br/>
<div>
<b>Last Sync: </b> <%= Qbo.last_sync %> <%= link_to " Sync Now", qbo_sync_path %>
<b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %> <%= link_to " Sync Now", qbo_sync_path %>
</div>

View File

@@ -36,7 +36,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
<br/>
<div>
<b>Last Sync: </b> <%= Qbo.last_sync %>
<b>Last Sync: </b> <%= Qbo.last_sync if Qbo.exists? %>
</div>
</body>

View File

@@ -34,7 +34,7 @@
<div class="clearfix">
VIN:
<div class="input">
<%= f.text_field :vin %>
<%= f.text_field :vin , :autofocus => true %>
</div>
</div>

View File

@@ -1,4 +0,0 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
//= require autocomplete-rails

View File

@@ -0,0 +1,2 @@
$("#issue_vehicles_id").empty()
.append("<%= escape_javascript(render(:partial => @vehicles)) %>")

View File

@@ -0,0 +1,10 @@
function customerSelected() {
customer_id = $('issue_customer_id').getValue();
console.log(customer_id);
}
document.observe('dom:loaded', function() {
customerSelected();
$('issue_customer_id').observe('change', customerSelected);
});

View File

@@ -19,3 +19,5 @@ en:
field_vehicles: "Vehicle"
field_vin: "VIN"
field_notes: "Notes"
field_qbo_billed: "Billed"
label_week: "Week"

View File

@@ -25,6 +25,9 @@ get 'qbo/invoice/:id', :to => 'invoice#show', as: :invoice
#manual billing
get 'qbo/bill/:id', :to => 'qbo#bill', as: :bill
#customer issue view
get 'customers/view/:token', :to => 'customers#view', as: :view
#payments
resources :payments

View File

@@ -0,0 +1,15 @@
#The MIT License (MIT)
#
#Copyright (c) 2016 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 UpdateIssuesRemoveInvoice < ActiveRecord::Migration
def change
remove_reference :issues, :qbo_invoice
end
end

View File

@@ -0,0 +1,19 @@
#The MIT License (MIT)
#
#Copyright (c) 2016 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 CreateCustomerTokens < ActiveRecord::Migration
def change
create_table :customer_tokens do |t|
t.string :token
t.timestamp :expires_at
t.references :issue
end
end
end

View File

@@ -15,12 +15,13 @@ Redmine::Plugin.register :redmine_qbo do
require_dependency 'issues_save_hook_listener'
require_dependency 'issues_show_hook_listener'
require_dependency 'users_show_hook_listener'
require_dependency 'header_footer_hook_listener.rb'
require_dependency 'header_footer_hook_listener'
# Patches to the Redmine core. Will not work in development mode
require_dependency 'issue_patch'
require_dependency 'user_patch'
require_dependency 'query_patch'
require_dependency 'time_entry_query_patch'
require_dependency 'pdf_patch'
Rails.configuration.to_prepare do
@@ -30,7 +31,7 @@ Redmine::Plugin.register :redmine_qbo do
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 '0.4.0'
version '0.4.1'
url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'http://rickbarrette.org'
settings :default => {'empty' => true}, :partial => 'qbo/settings'
@@ -46,7 +47,7 @@ Redmine::Plugin.register :redmine_qbo do
# We are playing in the sandbox
#Quickbooks.sandbox_mode = true
# set per_page globally
WillPaginate.per_page = 10

View File

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

View File

@@ -23,6 +23,7 @@ module IssuePatch
base.class_eval do
unloadable # Send unloadable so it will not be unloaded in development
belongs_to :customer, primary_key: :id
belongs_to :customer_token, primary_key: :id
belongs_to :qbo_estimate, primary_key: :id
has_and_belongs_to_many :qbo_invoices
#, :association_foreign_key => 'issue_id', :class_name => 'Issue', :join_table => 'issues_qbo_invoices'
@@ -90,6 +91,11 @@ module IssuePatch
end
end
# Create a shareable link for a customer
def share_token
CustomerToken.create(:expires_at => Time.now + 24.hours, :issue_id => id)
end
end
# Add module to Issue

View File

@@ -12,8 +12,9 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
# Load the javascript
def view_layouts_base_html_head(context = {})
javascript_include_tag 'vehicles', :plugin => 'redmine_qbo'
javascript_include_tag 'autocomplete', :plugin => 'redmine_qbo'
js = javascript_include_tag 'vehicles', :plugin => 'redmine_qbo'
#js += javascript_include_tag 'update_vehicles', :plugin => 'redmine_qbo'
return js
end
# Edit Issue Form
@@ -28,7 +29,11 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
# Load customer information without callbacks
customer = Customer.find_by_id(selected_customer) if selected_customer
select_customer = f.select :customer_id, Customer.all.pluck(:name, :id).sort, :selected => selected_customer, include_blank: true
select_customer = f.select :customer_id,
Customer.all.pluck(:name, :id).sort,
:selected => selected_customer,
include_blank: true,
onchange: "$customerSelected;"
# Generate the drop down list of quickbooks extimates
select_estimate = f.select :qbo_estimate_id, QboEstimate.all.pluck(:doc_number, :id).sort! {|x, y| y <=> x}, :selected => selected_estimate, include_blank: true

View File

@@ -19,7 +19,7 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
# Display the quickbooks contact in the issue
def view_issues_show_details_bottom(context={})
issue = context[:issue]
# Check to see if there is a quickbooks user attached to the issue
if issue.customer
customer = link_to issue.customer.name, "#{Redmine::Utils::relative_url_root}/customers/#{issue.customer.id}"
@@ -52,44 +52,48 @@ class IssuesShowHookListener < Redmine::Hook::ViewListener
split_vin = vin.scan(/.{1,9}/) if vin
return "
<div class=\"attributes\">
<div class=\"splitcontent\">
<div class=\"customer_id attribute\">
<div class=\"label\"><span>Customer</span>:</div>
<div class=\"value\">#{customer}</div>
</div>
<div class=\"qbo_estimate_id attribute\">
<div class=\"label\"><span>Estimate</span>:</div>
<div class=\"value\">#{estimate_link}</div>
</div>
<div class=\"qbo_invoice_id attribute\">
<div class=\"label\"><span>Invoice</span>:</div>
<div class=\"value\">#{invoice_link}</div>
<div class=\"splitcontentleft\">
<div class=\"customer_id attribute\">
<div class=\"label\"><span>Customer</span>:</div>
<div class=\"value\">#{customer}</div>
</div>
<div class=\"qbo_estimate_id attribute\">
<div class=\"label\"><span>Estimate</span>:</div>
<div class=\"value\">#{estimate_link}</div>
</div>
<div class=\"qbo_invoice_id attribute\">
<div class=\"label\"><span>Invoice</span>:</div>
<div class=\"value\">#{invoice_link}</div>
</div>
</div>
<br/>
<div class=\"vehicle attribute\">
<div class=\"label\"><span>Vehicle</span>:</div>
<div class=\"value\">#{vehicle}</div>
</div>
<div class=\"splitcontentleft\">
<div class=\"vehicle attribute\">
<div class=\"label\"><span>Vehicle</span>:</div>
<div class=\"value\">#{vehicle}</div>
</div>
<div class=\"vehicle_vin attribute\">
<div class=\"label\"><span>VIN</span>:</div>
<div class=\"value\">#{split_vin[0] if split_vin}<b>#{split_vin[1] if split_vin}</b></div>
</div>
<div class=\"vehicle_vin attribute\">
<div class=\"label\"><span>VIN</span>:</div>
<div class=\"value\">#{split_vin[0] if split_vin}<b>#{split_vin[1] if split_vin}</b></div>
<div class=\"vehicle_notes attribute\">
<div class=\"label\"><span>Notes</span>:</div>
<div class=\"value\">#{notes}</div>
</div>
</div>
<div class=\"vehicle_notes attribute\">
<div class=\"label\"><span>Notes</span>:</div>
<div class=\"value\">#{notes}</div>
</div>
</div> "
</div>"
end
def view_issues_show_description_bottom(context={})
return "<br/> #{button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get}"
bill_button = button_to "Bill Time", "#{Redmine::Utils::relative_url_root}/qbo/bill/#{context[:issue].id}", method: :get if User.current.admin?
share_button = button_to "Share", "#{Redmine::Utils::relative_url_root}/customers/view/#{context[:issue].share_token.token}", method: :get if User.current.logged?
return "<br/> #{bill_button} #{share_button}"
end
end

View File

@@ -36,6 +36,7 @@ module QueryPatch
unless @available_columns
@available_columns = available_columns_without_qbo
@available_columns << QueryColumn.new(:customer, :sortable => "#{Customer.table_name}.name", :groupable => true, :caption => :field_customer)
@available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
end
@available_columns
end

View File

@@ -0,0 +1,71 @@
#The MIT License (MIT)
#
#Copyright (c) 2016 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.
require_dependency 'time_entry_query'
module TimeEntryQueryPatch
def self.included(base) # :nodoc:
base.extend(ClassMethods)
base.send(:include, InstanceMethods)
# Same as typing in the class
base.class_eval do
unloadable # Send unloadable so it will not be unloaded in development
alias_method_chain :available_columns, :qbo_billed
alias_method_chain :available_filters, :qbo_billed
end
end
module ClassMethods
end
module InstanceMethods
def available_columns_with_qbo_billed
unless @available_columns
@available_columns = available_columns_without_qbo
@available_columns << QueryColumn.new(:qbo_billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_qbo_billed)
end
@available_columns
end
def available_filters_with_qbo_billed
unless @available_filters
@available_filters = available_filters_without_qbo
#qbo_filters = {
# :customer => {
# :id => l(:field_qbo_billed),
# :type => :boolean,
# :order => @available_filters.size + 1},
#}
qbo_filters = {
"qbo_billed" => {
:id => :qbo_billed,
:type => :list_optional,
:order => @available_filters.size + 1,
#:values => Customer.find(:all).collect { |c| [c.name, c.id.to_s]}
}
}
@available_filters.merge!(qbo_filters)
end
@available_filters
end
end
end
# Add module to TimeEntryQuery
TimeEntryQuery.send(:include, QueryPatch)

View File

@@ -0,0 +1,9 @@
require File.expand_path('../../test_helper', __FILE__)
class CustomerTokenTest < ActiveSupport::TestCase
# Replace this with your real tests.
def test_truth
assert true
end
end