ricky/redmine_qbo
1
1
Fork 0
mirror of https://github.com/rickbarrette/redmine_qbo.git synced 2026-02-13 09:13:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

loose the hash rocket, use symbol keys

Browse Source
This commit is contained in:
Ricky Barrette
2026-01-29 22:30:59 -05:00
parent f24128ef75
commit b80e1d4e28
44 changed files with 155 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/customers_controller.rb
View File

@@ -26,13 +26,13 @@ class CustomersController < ApplicationController
include SortHelper
helper :timelog
before_action :add_customer, :only => :new
before_action :view_customer, :except => [:new, :view]
skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:view]
before_action :add_customer, only: :new
before_action :view_customer, except: [:new, :view]
skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:view]
default_search_scope :names
autocomplete :customer, :name, :full => true, :extra_data => [:id]
autocomplete :customer, :name, full: true, extra_data: [:id]
def allowed_params
params.require(:customer).permit(:name, :email, :primary_phone, :mobile_phone, :phone_number, :notes)
@@ -53,7 +53,7 @@ class CustomersController < ApplicationController
# display a list of all customers
def index
if params[:search]
@customers = Customer.search(params[:search]).paginate(:page => params[:page])
@customers = Customer.search(params[:search]).paginate(page: params[:page])
if only_one_non_zero?(@customers)
redirect_to @customers.first
end
@@ -161,7 +161,7 @@ class CustomersController < ApplicationController
@issue = Issue.find @token.issue_id
@journals = @issue.journals.
preload(:details).
preload(:user => :email_address).
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)
@@ -175,7 +175,7 @@ class CustomersController < ApplicationController
@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)
@time_entry = TimeEntry.new(issue: @issue, project: @issue.project)
@relation = IssueRelation.new
rescue
render_403

12
app/controllers/estimate_controller.rb
View File

@@ -11,8 +11,8 @@ class EstimateController < ApplicationController
include AuthHelper
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? }
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
# Force sync for estimate by doc number if not found
@@ -36,9 +36,9 @@ class EstimateController < ApplicationController
estimate = get_estimate
begin
send_data estimate.pdf, filename: "estimate #{estimate.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" }
redirect_to :back, flash: { error: "Estimate not found" }
end
end
@@ -49,9 +49,9 @@ class EstimateController < ApplicationController
estimate = get_estimate
begin
send_data estimate.pdf, filename: "estimate #{estimate.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" }
redirect_to :back, flash: { error: "Estimate not found" }
end
end

10
app/controllers/invoice_controller.rb
View File

@@ -12,8 +12,8 @@ class InvoiceController < ApplicationController
include AuthHelper
require 'combine_pdf'
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? }
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? }
#
# Downloads and forwards the invoice pdf
@@ -23,7 +23,7 @@ class InvoiceController < ApplicationController
begin
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
# If multiple id's then pull each pdf & combine them
if params[:invoice_ids]
@@ -45,10 +45,10 @@ class InvoiceController < ApplicationController
ref = invoice.doc_number
end
send_data @pdf, filename: "invoice #{ref}.pdf", :disposition => 'inline', :type => "application/pdf"
send_data @pdf, filename: "invoice #{ref}.pdf", disposition: 'inline', type: "application/pdf"
end
rescue
redirect_to :back, :flash => { :error => "Invoice not found" }
redirect_to :back, flash: { error: "Invoice not found" }
end
end
end

16
app/controllers/qbo_controller.rb
View File

@@ -14,8 +14,8 @@ class QboController < ApplicationController
include AuthHelper
before_action :require_user, :except => :webhook
skip_before_action :verify_authenticity_token, :check_if_login_required, :only => [:webhook]
before_action :require_user, except: :webhook
skip_before_action :verify_authenticity_token, :check_if_login_required, only: [:webhook]
def allowed_params
params.permit(:code, :state, :realmId, :id)
@@ -51,9 +51,9 @@ class QboController < ApplicationController
qbo.refresh_token!
if qbo.save!
redirect_to qbo_sync_path, :flash => { :notice => I18n.t(:label_connected) }
redirect_to qbo_sync_path, flash: { notice: I18n.t(:label_connected) }
else
redirect_to plugin_settings_path(:redmine_qbo), :flash => { :error => I18n.t(:label_error) }
redirect_to plugin_settings_path(:redmine_qbo), flash: { error: I18n.t(:label_error) }
end
end
@@ -65,9 +65,9 @@ class QboController < ApplicationController
i = Issue.find_by_id params[:id]
if i.customer
i.bill_time
redirect_to i, :flash => { :notice => I18n.t(:label_billed_success) + i.customer.name }
redirect_to i, flash: { notice: I18n.t(:label_billed_success) + i.customer.name }
else
redirect_to i, :flash => { :error => I18n.t(:label_billing_error) }
redirect_to i, flash: { error: I18n.t(:label_billing_error) }
end
end
@@ -125,7 +125,7 @@ class QboController < ApplicationController
ActiveRecord::Base.connection.close
end
# The webhook doesn't require a response but let's make sure we don't send anything
render :nothing => true, status: 200
render nothing: true, status: 200
else
render nothing: true, status: 400
end
@@ -152,6 +152,6 @@ class QboController < ApplicationController
ActiveRecord::Base.connection.close
end
redirect_to :home, :flash => { :notice => I18n.t(:label_syncing) }
redirect_to :home, flash: { notice: I18n.t(:label_syncing) }
end
end

8
app/models/customer.rb
View File

@@ -142,7 +142,7 @@ class Customer < ActiveRecord::Base
# Sync ALL customers if the database is empty
qbo = Qbo.first
customers = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
service.all
end
@@ -178,7 +178,7 @@ class Customer < ActiveRecord::Base
def self.sync_by_id(id)
qbo = Qbo.first
c = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
service.fetch_by_id(id)
end
@@ -205,7 +205,7 @@ class Customer < ActiveRecord::Base
begin
qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
service.update(@details)
end
#raise "QBO Fault" if @details.fault?
@@ -227,7 +227,7 @@ class Customer < ActiveRecord::Base
raise Exception unless self.id
qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Customer.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Customer.new(company_id: qbo.realm_id, access_token: access_token)
service.fetch_by_id(self.id)
end
rescue Exception => e

2
app/models/customer_token.rb
View File

@@ -55,7 +55,7 @@ class CustomerToken < ActiveRecord::Base
end
# only create new token if we have an issue to attach it to
return create(:issue_id => issue.id) if User.current.logged?
return create(issue_id: issue.id) if User.current.logged?
end
end

4
app/models/employee.rb
View File

@@ -16,7 +16,7 @@ class Employee < ActiveRecord::Base
def self.sync
qbo = Qbo.first
employees = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
service.all
end
@@ -36,7 +36,7 @@ class Employee < ActiveRecord::Base
def self.sync_by_id(id)
qbo = Qbo.first
employee = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Employee.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Employee.new(company_id: qbo.realm_id, access_token: access_token)
service.fetch_by_id(id)
end

12
app/models/estimate.rb
View File

@@ -25,7 +25,7 @@ class Estimate < ActiveRecord::Base
logger.info "Syncing ALL estimates"
qbo = Qbo.first
estimates = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
service.all
end
@@ -44,7 +44,7 @@ class Estimate < ActiveRecord::Base
logger.info "Syncing estimate #{id}"
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
process_estimate(service.fetch_by_id(id))
end
end
@@ -54,7 +54,7 @@ class Estimate < ActiveRecord::Base
logger.info "Syncing estimate by doc number #{number}"
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
process_estimate(service.find_by( :doc_number, number).first)
end
end
@@ -63,7 +63,7 @@ class Estimate < ActiveRecord::Base
def self.update(id)
qbo = Qbo.first
estimate = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
service.fetch_by_id(id)
end
@@ -90,7 +90,7 @@ class Estimate < ActiveRecord::Base
def pdf
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
estimate = service.fetch_by_id(id)
service.pdf(estimate)
end
@@ -122,7 +122,7 @@ class Estimate < ActiveRecord::Base
raise Exception unless self.id
qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Estimate.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Estimate.new(company_id: qbo.realm_id, access_token: access_token)
service(:estimate).fetch_by_id(self.id)
end
rescue Exception => e

10
app/models/invoice.rb
View File

@@ -32,7 +32,7 @@ class Invoice < ActiveRecord::Base
# .all() is never called since count is never initialized
qbo = Qbo.first
invoices = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
service.all
end
@@ -48,7 +48,7 @@ class Invoice < ActiveRecord::Base
logger.info "Syncing invoice #{id}"
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
invoice = service.fetch_by_id(id)
process_invoice invoice
end
@@ -151,7 +151,7 @@ class Invoice < ActiveRecord::Base
logger.info "Invoice.push_updates"
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
service.update invoice
end
rescue
@@ -167,7 +167,7 @@ class Invoice < ActiveRecord::Base
def pdf
qbo = Qbo.first
qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
invoice = service.fetch_by_id(id)
return service.pdf(invoice)
end
@@ -197,7 +197,7 @@ class Invoice < ActiveRecord::Base
raise Exception unless self.id
qbo = Qbo.first
@details = qbo.perform_authenticated_request do |access_token|
service = Quickbooks::Service::Invoice.new(:company_id => qbo.realm_id, :access_token => access_token)
service = Quickbooks::Service::Invoice.new(company_id: qbo.realm_id, access_token: access_token)
service.fetch_by_id(self.id)
end
rescue Exception => e

20
app/views/customers/_form.html.erb
View File

@@ -7,28 +7,28 @@
<div class="clearfix">
<%=t(:label_display_name)%>
<div class="input">
<%= f.text_field :name, :required => true, :autocomplete => "off" %>
<%= 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, :autocomplete => "off" %>
<%= f.telephone_field :primary_phone, autocomplete: "off" %>
</div>
</div>
<div class="clearfix">
<%=t(:label_mobile_phone)%>:
<div class="input">
<%= f.telephone_field :mobile_phone, :autocomplete => "off" %>
<%= f.telephone_field :mobile_phone, autocomplete: "off" %>
</div>
</div>
<div class="clearfix">
<%=t(:label_email)%>:
<div class="input">
<%= f.email_field :email, :autocomplete => "off" %>
<%= f.email_field :email, autocomplete: "off" %>
</div>
</div>
@@ -36,13 +36,13 @@
<%=t(:field_notes)%>:
<div class="input">
<p>
<%= content_tag 'span', :id => "issue_description_and_toolbar" do %>
<%= content_tag 'span', id: "issue_description_and_toolbar" do %>
<%= f.text_area :notes,
:cols => 60,
:rows => 10,
:accesskey => accesskey(:edit),
:class => 'wiki-edit',
:no_label => true %>
cols: 60,
rows: 10,
accesskey: accesskey(:edit),
class: 'wiki-edit',
no_label: true %>
<% end %>
</p>
<%= wikitoolbar_for 'issue_description' %>

4
app/views/customers/_search.html.erb
View File

@@ -1,5 +1,5 @@
<%= form_tag(customers_path, :method => "get", id: "search-form") do %>
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), :autocomplete => "off" %>
<%= form_tag(customers_path, method: "get", id: "search-form") do %>
<%= text_field_tag :search, params[:search], placeholder: t(:label_search_customers), autocomplete: "off" %>
<%= submit_tag t(:label_search) %>
<% end %>
<%= button_to t(:label_new_customer), new_customer_path, method: :get%>

2
app/views/customers/_sidebar.html.erb
View File

@@ -1,2 +1,2 @@
<h3><%=t(:label_customers)%></h3>
<%= render :partial => 'customers/search' %>
<%= render partial: 'customers/search' %>

2
app/views/customers/edit.html.erb
View File

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

2
app/views/customers/filter_estimates_by_customer.js.erb
View File

@@ -1 +1 @@
$('select#issue_estimate_id').html('<%= j content_tag(:option,'',:value=>"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');
$('select#issue_estimate_id').html('<%= j content_tag(:option,'',value:"")+options_from_collection_for_select(@filtered_estimates, :id, :doc_number) %>');

4
app/views/customers/index.html.erb
View File

@@ -1,4 +1,4 @@
<h2><%=t(:field_customers)%> <span style="float:right"> <%= render :partial => 'customers/search' %> </span> </h2>
<h2><%=t(:field_customers)%> <span style="float:right"> <%= render partial: 'customers/search' %> </span> </h2>
<% if @customers.present? %>
<br/>
<% @customers.each do |c| %>
@@ -20,5 +20,5 @@
<% end %>
<div>
<%= render :partial => 'qbo/stats' %>
<%= render partial: 'qbo/stats' %>
</div>

2
app/views/customers/new.html.erb
View File

@@ -1,3 +1,3 @@
<h2><%=t(:label_new_customer)%></h2>
<br/>
<%= render :partial => 'customers/form' %>
<%= render partial: 'customers/form' %>

12
app/views/customers/show.html.erb
View File

@@ -12,12 +12,12 @@
<div class="splitcontent">
<div class="splitcontentleft">
<h4><%=t(:field_customer)%>:</h4>
<%= render :partial => 'customers/details', locals: {customer: @customer} %>
<%= render partial: 'customers/details', locals: {customer: @customer} %>
</div>
<div class="splitcontentleft">
<h4><%=t(:label_actions)%>:</h4>
<%= render :partial => 'customers/actions', locals: {customer: @customer} %>
<%= render partial: 'customers/actions', locals: {customer: @customer} %>
</div>
</div>
@@ -27,12 +27,12 @@
<div class="splitcontent">
<div class="splitcontentleft">
<h4><%=t(:estimates)%>:</h4>
<%= render :partial => 'estimates/list', locals: {customer: @customer} %>
<%= render partial: 'estimates/list', locals: {customer: @customer} %>
</div>
<div class="splitcontentleft">
<h4><%=t(:label_invoices)%>:</h4>
<%= render :partial => 'invoices/list', locals: {customer: @customer} %>
<%= render partial: 'invoices/list', locals: {customer: @customer} %>
</div>
</div>
@@ -47,7 +47,7 @@
<br/>
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
<%= render partial: 'issues/list_simple', locals: {issues: @issues.open} %>
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%> - <%= @closed_hours.round(1)%> <%=t(:label_hours)%></h3>
<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
<%= render partial: 'issues/list_simple', locals: {issues: @closed_issues} %>

38
app/views/customers/view.html.erb
View File

@@ -4,7 +4,7 @@
<div class="<%= @issue.css_classes %> details">
<%= avatar(@issue.author, :size => "50") %>
<%= avatar(@issue.author, size: "50") %>
<div class="subject">
<%= render_issue_subject_with_tree(@issue) %>
@@ -19,39 +19,39 @@
<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'
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 ? @issue.assigned_to : "-"), :class => 'assigned-to'
# rows.left l(:field_assigned_to), avatar(@issue.assigned_to, size: "14").to_s.html_safe + (@issue.assigned_to ? @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'
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 ? @issue.fixed_version : "-"), :class => 'fixed-version'
rows.left l(:field_fixed_version), (@issue.fixed_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'
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'
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'
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'
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'
rows.right l(:label_spent_time), issue_spent_hours_details(@issue), class: 'spent-time'
end
#end
end %>
<%= render_full_width_custom_fields_rows(@issue) %>
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
<%= call_hook(:view_issues_show_details_bottom, issue: @issue) %>
</div>
<% if @issue.description? || @issue.attachments.any? -%>
@@ -59,19 +59,19 @@ end %>
<% 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? %>
<%= 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 %>
<%= textilizable @issue, :description, attachments: @issue.attachments %>
</div>
</div>
<% end %>
<%= link_to_attachments @issue, :thumbnails => true %>
<%= link_to_attachments @issue, thumbnails: true %>
<% end -%>
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
<%= call_hook(:view_issues_show_description_bottom, issue: @issue) %>
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
<hr />
@@ -87,7 +87,7 @@ end %>
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
<hr />
<div id="relations">
<%= render :partial => 'issues/relations' %>
<%= render partial: 'issues/relations' %>
</div>
<% end %>
@@ -96,14 +96,14 @@ end %>
<% if @changesets.present? %>
<div id="issue-changesets">
<h3><%=l(:label_associated_revisions)%></h3>
<%= render :partial => 'issues/changesets', :locals => { :changesets => @changesets} %>
<%= 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 } %>
<%= render partial: 'issues/history', locals: { issue: @issue, journals: @journals } %>
</div>
<% end %>

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

@@ -1,4 +1,4 @@
<%= 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" %>
<%= 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
app/views/estimates/_sidebar.html.erb
View File

@@ -1,2 +1,2 @@
<h3><%=t(:label_estimates) %></h3>
<%= render :partial => 'estimates/search' %>
<%= render partial: 'estimates/search' %>

10
app/views/issues/_history.html.erb
View File

@@ -3,12 +3,12 @@
<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
<div id="note-<%= journal.indice %>">
<div class="contextual">
<span class="journal-actions"><%= render_journal_actions(issue, journal, :reply_links => reply_links) %></span>
<span class="journal-actions"><%= render_journal_actions(issue, journal, reply_links: reply_links) %></span>
<a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>
</div>
<h4>
<%= avatar(journal.user, :size => "24") %>
<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
<%= avatar(journal.user, size: "24") %>
<%= authoring journal.created_on, journal.user, label: :label_updated_time_by %>
<%= render_private_notes_indicator(journal) %>
</h4>
@@ -26,10 +26,10 @@
</div>
<% end %>
<% end %>
<%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
<%= render_notes(issue, journal, reply_links: reply_links) unless journal.notes.blank? %>
</div>
</div>
<%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
<%= call_hook(:view_issues_history_journal_bottom, { journal: journal }) %>
<% end %>
<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>

2
app/views/issues/_list_simple.html.erb
View File

@@ -11,7 +11,7 @@
<% for issue in issues %>
<tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
<td class="id">
<%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
<%= check_box_tag("ids[]", issue.id, false, style: 'display:none;', id: nil) %>
<%= link_to(issue.id, issue_path(issue)) %>
</td>
<td class="project"><%= link_to_project(issue.project) %></td>

4
app/views/qbo/_sidebar.html.erb
View File

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

2
app/views/qbo/_stats.html.erb
View File

@@ -1 +1 @@
<%= Customer.count %> <%=t(:field_customers)%> - <%= render :partial => 'qbo/last_sync' %>
<%= Customer.count %> <%=t(:field_customers)%> - <%= render partial: 'qbo/last_sync' %>