ricky/redmine_qbo
1
1
Fork 0
mirror of https://github.com/rickbarrette/redmine_qbo.git synced 2025-11-08 08:54:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Ricky Barrette
2022-03-15 12:29:11 -04:00
parent 2745ecf242 0513763607
commit dec9eee90b
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/estimate_controller.rb
View File

@@ -14,16 +14,21 @@ class EstimateController < ApplicationController
before_action :require_user, :unless => proc {|c| session[:token].nil? }
skip_before_action :verify_authenticity_token, :check_if_login_required, :unless => proc {|c| session[:token].nil? }
def get_estimate
estimate = Estimate.find_by_id(params[:id]) if params[:id]
estimate = Estimate.find_by_doc_number(params[:search]) if params[:search]
return estimate
end
#
# Downloads and forwards the estimate pdf
#
def show
e = Estimate.find_by_id(params[:id]) if params[:id]
e = Estimate.find_by_doc_number(params[:search]) if params[:search]
estimate = get_estimate
begin
send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
rescue
redirect_to :back, :flash => { :error => "Estimate not found" }
end
@@ -33,11 +38,10 @@ class EstimateController < ApplicationController
# Downloads estimate by document number
#
def doc
e = Estimate.find_by_doc_number(params[:id]) if params[:id]
e = Estimate.find_by_doc_number(params[:search]) if params[:search]
estimate = get_estimate
begin
send_data e.pdf, filename: "estimate #{e.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
send_data estimate.pdf, filename: "estimate #{estimate.doc_number}.pdf", :disposition => 'inline', :type => "application/pdf"
rescue
redirect_to :back, :flash => { :error => "Estimate not found" }
end

2
app/controllers/qbo_controller.rb
View File

@@ -55,7 +55,7 @@ class QboController < ApplicationController
qbo.expire = 1.hour.from_now.utc
if qbo.save!
redirect_to sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
redirect_to qbo_sync_path, :flash => { :notice => "Successfully connected to Quickbooks" }
else
redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => "Error" }
end

2
app/views/estimates/_search.html.erb
View File

@@ -1,4 +1,4 @@
<%= form_tag("/qbo/estimate/doc", :method => "get", id: "est-search-form") do %>
<%= form_tag(estimate_doc_path, :method => "get") do %>
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_estimates), :autocomplete => "off" %>
<%= submit_tag t(:label_search), :formtarget => "_blank" %>
<% end %>

2
config/routes.rb
View File

@@ -20,7 +20,7 @@ post 'qbo/webhook', :to => 'qbo#webhook'
# Estimate & Invoice PDF
get 'estimates/:id', :to => 'estimate#show', as: :estimate
get 'estimates/doc/:id', :to => 'estimate#doc', as: :estimate_doc
get 'estimates/doc/', :to => 'estimate#doc', as: :estimate_doc
get 'invoices/:id', :to => 'invoice#show', as: :invoice
#manual billing

2
init.rb
View File

@@ -22,7 +22,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 '1.1.4'
version '1.1.5'
url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'http://rickbarrette.org'
settings :default => {'empty' => true}, :partial => 'qbo/settings'