diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3aef8bb..0a79838 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -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 diff --git a/app/controllers/estimate_controller.rb b/app/controllers/estimate_controller.rb index 8190c24..8464dd6 100644 --- a/app/controllers/estimate_controller.rb +++ b/app/controllers/estimate_controller.rb @@ -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 diff --git a/app/controllers/invoice_controller.rb b/app/controllers/invoice_controller.rb index a86666c..4c06e18 100644 --- a/app/controllers/invoice_controller.rb +++ b/app/controllers/invoice_controller.rb @@ -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 diff --git a/app/controllers/qbo_controller.rb b/app/controllers/qbo_controller.rb index 1acd248..8cd4026 100644 --- a/app/controllers/qbo_controller.rb +++ b/app/controllers/qbo_controller.rb @@ -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 diff --git a/app/models/customer.rb b/app/models/customer.rb index f579e5e..f5cfe15 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -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 diff --git a/app/models/customer_token.rb b/app/models/customer_token.rb index 96e9d48..049a385 100644 --- a/app/models/customer_token.rb +++ b/app/models/customer_token.rb @@ -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 diff --git a/app/models/employee.rb b/app/models/employee.rb index 8bde654..87cace8 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -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 diff --git a/app/models/estimate.rb b/app/models/estimate.rb index c93212a..5eab766 100644 --- a/app/models/estimate.rb +++ b/app/models/estimate.rb @@ -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 diff --git a/app/models/invoice.rb b/app/models/invoice.rb index 47b1460..3119ab6 100644 --- a/app/models/invoice.rb +++ b/app/models/invoice.rb @@ -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 diff --git a/app/views/customers/_form.html.erb b/app/views/customers/_form.html.erb index 3314742..dbc4cf9 100644 --- a/app/views/customers/_form.html.erb +++ b/app/views/customers/_form.html.erb @@ -7,28 +7,28 @@
- <%= 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 %>
<%= wikitoolbar_for 'issue_description' %> diff --git a/app/views/customers/_search.html.erb b/app/views/customers/_search.html.erb index 954cdff..3c86485 100644 --- a/app/views/customers/_search.html.erb +++ b/app/views/customers/_search.html.erb @@ -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%> diff --git a/app/views/customers/_sidebar.html.erb b/app/views/customers/_sidebar.html.erb index e22a3e7..be2754e 100644 --- a/app/views/customers/_sidebar.html.erb +++ b/app/views/customers/_sidebar.html.erb @@ -1,2 +1,2 @@<%=l(:field_description)%>
#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), :selected => @selected, include_blank: true}
" + return "#{context[:form].select :employee_id, Employee.all.pluck(:name, :id), selected: @selected, include_blank: true}
" end end diff --git a/lib/hooks/view_hook_listener.rb b/lib/hooks/view_hook_listener.rb index c36c9c1..e204d9f 100644 --- a/lib/hooks/view_hook_listener.rb +++ b/lib/hooks/view_hook_listener.rb @@ -12,7 +12,7 @@ module Hooks class ViewHookListener < Redmine::Hook::ViewListener - render_on :view_layouts_base_sidebar, :partial => "qbo/sidebar" + render_on :view_layouts_base_sidebar, partial: "qbo/sidebar" end diff --git a/lib/hooks/view_layouts_hook_listener.rb b/lib/hooks/view_layouts_hook_listener.rb index 9ffbc50..34023d9 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/issue_patch.rb b/lib/patches/issue_patch.rb index 1487d78..c3a6661 100644 --- a/lib/patches/issue_patch.rb +++ b/lib/patches/issue_patch.rb @@ -55,8 +55,8 @@ module Patches # Prepare to create a new Time Activity qbo = Qbo.first qbo.perform_authenticated_request do |access_token| - time_service = Quickbooks::Service::TimeActivity.new(:company_id => qbo.realm_id, :access_token => access_token) - item_service = Quickbooks::Service::Item.new(:company_id => qbo.realm_id, :access_token => access_token) + time_service = Quickbooks::Service::TimeActivity.new(company_id: qbo.realm_id, access_token: access_token) + item_service = Quickbooks::Service::Item.new(company_id: qbo.realm_id, access_token: access_token) time_entry = Quickbooks::Model::TimeActivity.new # Lets total up each activity before billing. diff --git a/lib/patches/pdf_patch.rb b/lib/patches/pdf_patch.rb index b76147b..80976bb 100644 --- a/lib/patches/pdf_patch.rb +++ b/lib/patches/pdf_patch.rb @@ -143,10 +143,10 @@ module Patches # Set resize image scale pdf.set_image_scale(1.6) text = textilizable(issue, :description, - :only_path => false, - :edit_section_links => false, - :headings => false, - :inline_attachments => false + only_path: false, + edit_section_links: false, + headings: false, + inline_attachments: false ) pdf.RDMwriteFormattedCell(35+155, 5, '', '', text, issue.attachments, "LRB") @@ -233,10 +233,10 @@ module Patches pdf.ln unless journal.details.empty? pdf.SetFontStyle('',8) text = textilizable(journal, :notes, - :only_path => false, - :edit_section_links => false, - :headings => false, - :inline_attachments => false + only_path: false, + edit_section_links: false, + headings: false, + inline_attachments: false ) pdf.RDMwriteFormattedCell(190,5,'','', text, issue.attachments, "") end diff --git a/lib/patches/query_patch.rb b/lib/patches/query_patch.rb index a6f663d..6d19b9e 100644 --- a/lib/patches/query_patch.rb +++ b/lib/patches/query_patch.rb @@ -18,15 +18,15 @@ module Patches def available_columns unless @available_columns @available_columns = self.class.available_columns.dup - @available_columns << QueryColumn.new(:customer, :sortable => "#{Issue.table_name}.customer_id", :groupable => true, :caption => :field_customer) - @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.billed", :groupable => true, :caption => :field_billed) + @available_columns << QueryColumn.new(:customer, sortable: "#{Issue.table_name}.customer_id", groupable: true, caption: :field_customer) + @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.billed", groupable: true, caption: :field_billed) end super end # Add customers to filters def initialize_available_filters - #add_available_filter "customer", :type => :text + #add_available_filter "customer", type: :text super end diff --git a/lib/patches/time_entry_query_patch.rb b/lib/patches/time_entry_query_patch.rb index a66ec76..7946104 100644 --- a/lib/patches/time_entry_query_patch.rb +++ b/lib/patches/time_entry_query_patch.rb @@ -18,14 +18,14 @@ module Patches def available_columns unless @available_columns @available_columns = self.class.available_columns.dup - @available_columns << QueryColumn.new(:billed, :sortable => "#{TimeEntry.table_name}.name", :groupable => true, :caption => :field_billed) + @available_columns << QueryColumn.new(:billed, sortable: "#{TimeEntry.table_name}.name", groupable: true, caption: :field_billed) end super end # Add QBO options to the filter def initialize_available_filters - add_available_filter "billed", :type => :boolean + add_available_filter "billed", type: :boolean super end