diff --git a/app/controllers/estimate_controller.rb b/app/controllers/estimate_controller.rb index 8464dd6..78e4f00 100644 --- a/app/controllers/estimate_controller.rb +++ b/app/controllers/estimate_controller.rb @@ -36,7 +36,7 @@ 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" } end @@ -49,7 +49,7 @@ 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" } end diff --git a/app/controllers/invoice_controller.rb b/app/controllers/invoice_controller.rb index 4c06e18..dc7241b 100644 --- a/app/controllers/invoice_controller.rb +++ b/app/controllers/invoice_controller.rb @@ -45,7 +45,7 @@ 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" } diff --git a/app/controllers/qbo_controller.rb b/app/controllers/qbo_controller.rb index 8cd4026..a05455b 100644 --- a/app/controllers/qbo_controller.rb +++ b/app/controllers/qbo_controller.rb @@ -92,10 +92,10 @@ class QboController < ApplicationController data = params.as_json end # Process the information - entities = data['eventNotifications'][0]['dataChangeEvent']['entities'] + entities = data['eventNotifications'][0]['dataChangeEvent'][:entities] entities.each do |entity| - id = entity['id'].to_i - name = entity['name'] + id = entity[:id].to_i + name = entity[:name] logger.info "Casting #{name.constantize} to obj" @@ -106,7 +106,7 @@ class QboController < ApplicationController obj.destroy(entity['deletedId']) if entity['deletedId'] #Check to see if we are deleting a record - if entity['operation'].eql? "Delete" + if entity[:operation].eql? "Delete" obj.destroy(id) #if not then update! else diff --git a/app/models/concerns/quickbooks_oauth.rb b/app/models/concerns/quickbooks_oauth.rb index 2508f00..0a0138c 100644 --- a/app/models/concerns/quickbooks_oauth.rb +++ b/app/models/concerns/quickbooks_oauth.rb @@ -73,7 +73,7 @@ module QuickbooksOauth oauth_consumer_secret = Setting.plugin_redmine_qbo['settingsOAuthConsumerSecret'] # Are we are playing in the sandbox? - Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo['sandbox'] ? true : false + Quickbooks.sandbox_mode = Setting.plugin_redmine_qbo[:sandbox] ? true : false logger.info "Sandbox mode: #{Quickbooks.sandbox_mode}" options = { diff --git a/app/views/customers/_form.html.erb b/app/views/customers/_form.html.erb index dbc4cf9..e9f2cf1 100644 --- a/app/views/customers/_form.html.erb +++ b/app/views/customers/_form.html.erb @@ -36,7 +36,7 @@ <%=t(:field_notes)%>:

- <%= 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, @@ -45,7 +45,7 @@ no_label: true %> <% end %>

- <%= wikitoolbar_for 'issue_description' %> + <%= wikitoolbar_for :issue_description %>
diff --git a/app/views/customers/show.html.erb b/app/views/customers/show.html.erb index 25f9bf3..54045b5 100644 --- a/app/views/customers/show.html.erb +++ b/app/views/customers/show.html.erb @@ -1,4 +1,4 @@ -

<%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo['sandbox'] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %>

+

<%=t(:field_customer)%> #<%= @customer.id %> - <%= link_to @customer.to_s, "https://#{Setting.plugin_redmine_qbo[:sandbox] ? "sandbox" : "app"}.qbo.intuit.com/app/customerdetail?nameId=#{@customer.id}", target: :_blank %>

diff --git a/app/views/customers/view.html.erb b/app/views/customers/view.html.erb index ab33982..f1bc68b 100644 --- a/app/views/customers/view.html.erb +++ b/app/views/customers/view.html.erb @@ -19,27 +19,27 @@
<%= 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_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' # 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' + 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?) + 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' end - unless @issue.disabled_core_fields.include?('start_date') + 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') + 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' + 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') + 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 @@ -59,7 +59,7 @@ end %> <% if @issue.description? %>
- <%= 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? %>

<%=l(:field_description)%>

diff --git a/app/views/issues/_list_simple.html.erb b/app/views/issues/_list_simple.html.erb index c7c2cc2..5a12624 100644 --- a/app/views/issues/_list_simple.html.erb +++ b/app/views/issues/_list_simple.html.erb @@ -9,7 +9,7 @@ <% for issue in issues %> - + <%= check_box_tag("ids[]", issue.id, false, style: 'display:none;', id: nil) %> <%= link_to(issue.id, issue_path(issue)) %> diff --git a/app/views/qbo/_settings.html.erb b/app/views/qbo/_settings.html.erb index d120f31..bef2fb0 100644 --- a/app/views/qbo/_settings.html.erb +++ b/app/views/qbo/_settings.html.erb @@ -60,7 +60,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI <%=t(:label_sandbox)%> - <%= check_box_tag 'settings[sandbox]', @settings['sandbox'], @settings['sandbox'] %> + <%= check_box_tag 'settings[sandbox]', @settings[:sandbox], @settings[:sandbox] %> diff --git a/lib/hooks/view_layouts_hook_listener.rb b/lib/hooks/view_layouts_hook_listener.rb index 34023d9..68f54bb 100644 --- a/lib/hooks/view_layouts_hook_listener.rb +++ b/lib/hooks/view_layouts_hook_listener.rb @@ -14,9 +14,9 @@ module Hooks # Load the javascript to support the autocomplete forms def view_layouts_base_html_head(context = {}) - js = javascript_include_tag 'application.js', plugin: 'redmine_qbo' - js += javascript_include_tag 'autocomplete-rails.js', plugin: 'redmine_qbo' - js += javascript_include_tag 'checkbox_controller.js', plugin: 'redmine_qbo' + js = javascript_include_tag 'application.js', plugin: :redmine_qbo + js += javascript_include_tag 'autocomplete-rails.js', plugin: :redmine_qbo + js += javascript_include_tag 'checkbox_controller.js', plugin: :redmine_qbo return js end diff --git a/lib/patches/pdf_patch.rb b/lib/patches/pdf_patch.rb index 80976bb..c4896a3 100644 --- a/lib/patches/pdf_patch.rb +++ b/lib/patches/pdf_patch.rb @@ -54,9 +54,9 @@ module Patches left << [l(:field_status), issue.status] left << [l(:field_priority), issue.priority] left << [l(:field_customer), customer] - left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id') - #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id') - #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id') + left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?(:assigned_to_id) + #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?(:category_id) + #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?(:fixed_version_id) logger.debug "Calling :pdf_left hook" left_hook_output = Redmine::Hook.call_hook :pdf_left, { issue: issue } @@ -67,10 +67,10 @@ module Patches end right = [] - right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date') - right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date') - right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio') - right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours') + right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?(:start_date) + right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?(:due_date) + right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?(:done_ratio) + right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?(:estimated_hours) right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project) logger.debug "Calling :pdf_right hook"