fat_free_crm 0.16.4 → 0.17.1

data/app/views/opportunities/_index_brief.html.haml

@@ -1,6 +1,6 @@
 %li.highlight[opportunity]
   - if opportunity.stage
-    .strip{:class => opportunity.stage}= t(opportunity.stage)
+    .strip{class: opportunity.stage}= t(opportunity.stage)
   - else
     .strip.white #{t :other}
 
@@ -22,8 +22,8 @@
       –
       - user_name = opportunity.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => timeago(opportunity.created_at), :user => h(user_name)).html_safe
+        = t(:added_by, time_ago: timeago(opportunity.created_at), user: h(user_name)).html_safe
       - else
-        = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
+        = t(:added_ago, value: timeago(opportunity.created_at)).html_safe
 
-    = hook(:opportunity_bottom, self, :opportunity => opportunity)
+    = hook(:opportunity_bottom, self, opportunity: opportunity)

data/app/views/opportunities/_index_long.html.haml

@@ -1,6 +1,6 @@
 %li.highlight[opportunity]
   - if opportunity.stage
-    .strip{:class => opportunity.stage}= t(opportunity.stage)
+    .strip{class: opportunity.stage}= t(opportunity.stage)
   - else
     .strip.white #{t :other}
 
@@ -22,17 +22,17 @@
       –
       - user_name = opportunity.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => timeago(opportunity.created_at), :user => h(user_name)).html_safe
+        = t(:added_by, time_ago: timeago(opportunity.created_at), user: h(user_name)).html_safe
       - else
-        = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
+        = t(:added_ago, value: timeago(opportunity.created_at)).html_safe
 
     %dt
-      %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "
+      %b= number_to_currency(opportunity.weighted_amount, precision: 0) + " | "
       - won_or_lost = %w(won lost).include?(opportunity.stage)
       - unless won_or_lost
-        = number_to_currency(opportunity.amount || 0, :precision => 0)
+        = number_to_currency(opportunity.amount || 0, precision: 0)
         - if opportunity.discount
-          = t(:discount_number, number_to_currency(opportunity.discount, :precision => 0))
+          = t(:discount_number, number_to_currency(opportunity.discount, precision: 0))
         - else
           = t(:no_discount)
         = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
@@ -40,11 +40,11 @@
       - if opportunity.closes_on
         - if won_or_lost
           - if opportunity.closes_on >= Date.today
-            = t(:closing_date, l(opportunity.closes_on, :format => :mmddyy))
+            = t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
           - else
-            = t(:closed_ago_on, :time_ago => distance_of_time_in_words(opportunity.closes_on, Date.today), :date => l(opportunity.closes_on, :format => :mmddyy))
+            = t(:closed_ago_on, time_ago: distance_of_time_in_words(opportunity.closes_on, Date.today), date: l(opportunity.closes_on, format: :mmddyy))
         - elsif opportunity.closes_on > Date.today
-          = t(:expected_to_close,  :time => distance_of_time_in_words(Date.today, opportunity.closes_on), :date => l(opportunity.closes_on, :format => :mmddyy))
+          = t(:expected_to_close,  time: distance_of_time_in_words(Date.today, opportunity.closes_on), date: l(opportunity.closes_on, format: :mmddyy))
         - elsif opportunity.closes_on == Date.today
           %span.warn= t(:closes_today)
         - else
@@ -52,8 +52,8 @@
       - else
         = t(:no_closing_date)
 
-      - if opportunity.tag_list.present?
+      - if opportunity.tags.present?
         %dt
           .tags= tags_for_index(opportunity)
 
-    = hook(:opportunity_bottom, self, :opportunity => opportunity)
+    = hook(:opportunity_bottom, self, opportunity: opportunity)

data/app/views/opportunities/_new.html.haml

@@ -1,18 +1,18 @@
-= simple_form_for(@opportunity, :html => one_submit_only, :remote => true) do |f|
+= simple_form_for(@opportunity, html: one_submit_only, remote: true) do |f|
   = link_to_close new_opportunity_path
   = f.hidden_field :user_id
   = hidden_field_tag "contact",  "#{@contact.id  if @contact}"
 
-  = f.error_messages :object_name => t('opportunity')
+  = f.error_messages object_name: t('opportunity')
 
-  = render "opportunities/top_section", :f => f
-  = render "fields/edit_custom_field_group", :f => f
-  = render "shared/add_comment",        :f => f
-  = render "fields/groups",             :f => f
-  = render "entities/permissions",      :f => f, :entity => @opportunity
+  = render "opportunities/top_section", f: f
+  = render "fields/edit_custom_field_group", f: f
+  = render "shared/add_comment",        f: f
+  = render "fields/groups",             f: f
+  = render "entities/permissions",      f: f, entity: @opportunity
   = hook(:entity_form, self, {f: f, entity: @opportunity})
 
   .buttonbar
-    = f.submit t(:create_opportunity), :onclick => %/$("#account_assigned_to").val($("#opportunity_assigned_to").val()); if ($("#account_id").css('display') != 'none') { $("#account_id").enable(); }/
+    = f.submit t(:create_opportunity), onclick: %/$("#account_assigned_to").val($("#opportunity_assigned_to").val()); if ($("#account_id").css('display') != 'none') { $("#account_id").enable(); }/
     #{t :or}
     = link_to_cancel new_opportunity_path

data/app/views/opportunities/_opportunities.html.haml

@@ -1,6 +1,6 @@
 = section(object, :opportunities)
 .list#opportunities
-  - opportunities = object.opportunities.order('updated_at desc').paginate(:page => 1, :per_page => 20)
-  = render :partial => "opportunities/opportunity", :collection => opportunities
+  - opportunities = object.opportunities.order('updated_at desc').paginate(page: 1, per_page: 20)
+  = render partial: "opportunities/opportunity", collection: opportunities
 
 = paginate( collection: opportunities, id: 'opportunities_pagination', params: { action: 'opportunities' } )

data/app/views/opportunities/_opportunity.html.haml

@@ -1,5 +1,5 @@
-- if (params['controller'] == 'opportunities') and (template = template_for_current_view).present?
-  = render(template, :opportunity => opportunity)
+- if (controller.controller_name == 'opportunities') and (template = template_for_current_view).present?
+  = render(template, opportunity: opportunity)
 - else
   -# default view
-  = render 'opportunities/index_long', :opportunity => opportunity
+  = render 'opportunities/index_long', opportunity: opportunity

data/app/views/opportunities/_sidebar_index.html.haml

@@ -1,20 +1,20 @@
 .filters#filters
   .caption= t :opportunity_stages
   - @stage.each do |value, key|
-    .check_box{:style => "border-bottom: 1px silver dotted;"}
-      %div{:style => "float:right;"}
+    .check_box{style: "border-bottom: 1px silver dotted;"}
+      %div{style: "float:right;"}
         = @opportunity_stage_total[key]
       = opportunity_stage_checkbox(key, @opportunity_stage_total[key])
       = label_tag(key, value)
 
-  .check_box{:style => "border-bottom: 1px silver dotted;"}
-    %div{:style => "float:right;"}
+  .check_box{style: "border-bottom: 1px silver dotted;"}
+    %div{style: "float:right;"}
       = @opportunity_stage_total[:other]
     = opportunity_stage_checkbox("other", @opportunity_stage_total[:other])
     = label_tag(:other, t(:other))
 
   .check_box
-    %div{:style => "float:right;"}
+    %div{style: "float:right;"}
       %b= @opportunity_stage_total[:all]
     %b #{t :total_opportunities}
   = hook(:index_opportunity_sidebar_bottom, self)

data/app/views/opportunities/_sidebar_show.html.haml

@@ -4,7 +4,7 @@
     %dt= @opportunity.stage ? t(@opportunity.stage) : t(:other)
     %tt #{t :stage}:
   %li
-    %dt= @opportunity.closes_on ? l(@opportunity.closes_on, :format => :mmdd) : t(:n_a)
+    %dt= @opportunity.closes_on ? l(@opportunity.closes_on, format: :mmdd) : t(:n_a)
     %tt #{t :close_date}:
   - if @opportunity.closes_on && @opportunity.stage !~ /lost|won/
     %li
@@ -13,37 +13,37 @@
         %dt= days_left
         %tt #{t :days_left}:
       - else
-        %dt.warn= t('pluralize.day', :count => (days_left * -1))
+        %dt.warn= t('pluralize.day', count: (days_left * -1))
         %tt #{t :days_late}:
   %li
     %dt= @opportunity.probability ? @opportunity.probability.to_s + "%" : t(:n_a)
     %tt #{t :probability}:
   %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.amount || 0, :precision => 0) : t(:n_a)
+    %dt= @opportunity.amount ? number_to_currency(@opportunity.amount || 0, precision: 0) : t(:n_a)
     %tt #{t :amount}:
   %li
-    %dt= @opportunity.discount ? number_to_currency(@opportunity.discount || 0, :precision => 0) : t(:n_a)
+    %dt= @opportunity.discount ? number_to_currency(@opportunity.discount || 0, precision: 0) : t(:n_a)
     - if @opportunity.amount && @opportunity.discount
-      %tt== Discount (#{number_to_percentage(@opportunity.discount / @opportunity.amount * 100, :precision => 1)}):
+      %tt== Discount (#{number_to_percentage(@opportunity.discount / @opportunity.amount * 100, precision: 1)}):
     - else
       %tt #{t :discount}:
   %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount || 0, :precision => 0) : t(:n_a)
+    %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount || 0, precision: 0) : t(:n_a)
     %tt #{t :weighted_amount}:
   %li
-    %dt= @opportunity.assigned_to ? truncate(@opportunity.assignee.full_name, :length => 16) : nil
+    %dt= @opportunity.assigned_to ? truncate(@opportunity.assignee.full_name, length: 16) : nil
     %tt #{t :assigned_to}:
   %li
     %dt
       - if @opportunity.account
-        = link_to(truncate(@opportunity.account.name, :length => 16), @opportunity.account, :title => @opportunity.account.name)
+        = link_to(truncate(@opportunity.account.name, length: 16), @opportunity.account, title: @opportunity.account.name)
       - else
         #{t :n_a}
     %tt #{t :account}:
   %li.last
     %dt
       - if @opportunity.campaign
-        = link_to(truncate(@opportunity.campaign.name, :length => 16), @opportunity.campaign, :title => @opportunity.campaign.name)
+        = link_to(truncate(@opportunity.campaign.name, length: 16), @opportunity.campaign, title: @opportunity.campaign.name)
       - else
         #{t :n_a}
     %tt #{t :campaign}:
@@ -52,10 +52,10 @@
     .caption #{t :background_info}
     = auto_link(simple_format @opportunity.background_info)
 
-  = render "fields/sidebar_show", :asset => @opportunity
+  = render "fields/sidebar_show", asset: @opportunity
 
-  - if @opportunity.tag_list.present?
+  - if @opportunity.tags.present?
     %dt
       .tags= tags_for_index(@opportunity)
 
-  = hook(:show_opportunity_sidebar_bottom, self, :opportunity => @opportunity)
+  = hook(:show_opportunity_sidebar_bottom, self, opportunity: @opportunity)

data/app/views/opportunities/_title_bar.html.haml

@@ -1,11 +1,11 @@
 #confirm{ hidden }
 .title_tools#menu
-  = link_to_inline(:edit_opportunity, edit_opportunity_path(@opportunity), :text => t(:edit)) + " | "
+  = link_to_inline(:edit_opportunity, edit_opportunity_path(@opportunity), text: t(:edit)) + " | "
   = link_to_function(t(:delete) + '?', confirm_delete(@opportunity))
 .title_tools#buttons
   = view_buttons
 .title#edit_opportunity_title
   = h(@opportunity.name)
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 
 %div#edit_opportunity{ hidden }

data/app/views/opportunities/_top_section.html.haml

@@ -1,32 +1,32 @@
-= hook(:opportunity_top_section, self, :f => f) do
+= hook(:opportunity_top_section, self, f: f) do
   .section
     %table
       %tr
         %td
           .label.req.top #{t :name}:
-          = f.text_field :name, :autofocus => true, :style => "width:325px"
+          = f.text_field :name, autofocus: true, style: "width:325px"
         %td= spacer
         %td
           .label.req.top #{t :stage}:
-          = f.select :stage, @stage, { :selected => @opportunity.stage ? @opportunity.stage.to_sym : nil }, { :style => "width:160px" }
+          = f.select :stage, @stage, { selected: @opportunity.stage ? @opportunity.stage.to_sym : nil }, { style: "width:160px", class: 'select2' }
 
-    %table{ :border => 0, :width => 500, :cellpadding => 0, :cellspacing => 0 }
+    %table{ border: 0, width: 500, cellpadding: 0, cellspacing: 0 }
       %tr
         %td
           .label #{t :close_date}:
-          = f.text_field :closes_on, :value => f.object.closes_on, :style => "width:110px;", :autocomplete => :off, :class => 'date'
+          = f.text_field :closes_on, value: f.object.closes_on, style: "width:110px;", autocomplete: :off, class: 'date'
         %td= spacer
         %td
           .label #{t :probability} (%):
-          = f.text_field :probability, :style => "width:110px; text-align:right;"
+          = f.text_field :probability, style: "width:110px; text-align:right;"
         %td= spacer
         %td
           .label #{t :amount} #{t :currency}:
-          = f.text_field :amount, :style => "width:110px; text-align:right;"
+          = f.text_field :amount, style: "width:110px; text-align:right;"
         %td= spacer
         %td
           .label #{t :discount} #{t :currency}:
-          = f.text_field :discount, :style => "width:110px; text-align:right;"
+          = f.text_field :discount, style: "width:110px; text-align:right;"
 
     = fields_for(@account) do |a|
       = a.hidden_field :user_id
@@ -38,7 +38,7 @@
             != account_select_or_create(a) do |options|
               -# Add [-- None --] account choice when editing existing opportunity that has an account.
               - options[:selected] = @account.id || 0
-              - options[:include_blank] = true #t(:select_none) unless @opportunity.new_record? || @opportunity.account.blank?
+
           %td= spacer
           %td
             .label.req #{t :assigned_to}:
@@ -46,14 +46,14 @@
         %tr
           %td
             .label #{t :campaign}:
-            = opportunity_campaign_select( selected: (@campaign.try(:id) || @opportunity.campaign_id), include_blank: true )
+            = opportunity_campaign_select(selected: (@campaign.try(:id) || @opportunity.campaign_id), include_blank: true)
 
         - if Setting.background_info && Setting.background_info.include?(:opportunity)
           %tr
             %td(colspan="3")
-              .label= t(:background_info) << ':'
-              = f.text_area :background_info, :style =>"width:500px", :rows => 3
+              .label= t(:background_info) + ':'
+              = f.text_area :background_info, style: "width:500px", rows: 3
 
-        = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
+        = render partial: "/shared/tags", locals: {f: f, span: 3}
 
-        = hook(:opportunity_top_section_bottom, self, :f => f)
+        = hook(:opportunity_top_section_bottom, self, f: f)

data/app/views/opportunities/contacts.js.haml

@@ -1,3 +1,3 @@
-- @contacts = @opportunity.contacts.paginate(:page => params[:page], :per_page => 20)
-$('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => @contacts) }');
+- @contacts = @opportunity.contacts.paginate(page: params[:page], per_page: 20)
+$('#contacts').html('#{ j render(partial: 'contacts/contact', collection: @contacts) }');
 $('#contacts_pagination').replaceWith('#{ j paginate(collection: @contacts, id: 'contacts_pagination', params: { action: 'contacts' } ) }');

data/app/views/opportunities/create.js.haml

@@ -6,12 +6,12 @@
   $('##{create_id}_arrow').html(crm.COLLAPSED);
   $('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
   $('##{create_id}').slideUp(250);
-  $('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+  $('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
   $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
 
   - if called_from_index_page?
     = refresh_sidebar(:index, :filters)
-    $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+    $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   - elsif called_from_landing_page?("accounts") # Opportunity created on Account landing page: refresh Account summary.
     - @account.reload
     = refresh_sidebar_for(:accounts, :show, :summary)
@@ -19,11 +19,11 @@
     - @campaign.reload
     = refresh_sidebar_for(:campaigns, :show, :summary)
   - else # Opportunity created on Contact landing page: refresh recent items list.
-    $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+    $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
   crm.flick('empty', 'remove');
 
 - else
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
   $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();

data/app/views/opportunities/destroy.js.haml

@@ -4,10 +4,10 @@
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 - if called_from_index_page?
   = refresh_sidebar(:index, :filters)
-  $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
 - elsif called_from_landing_page?("accounts")
   = refresh_sidebar_for(:accounts, :show, :summary)
 - elsif called_from_landing_page?("campaigns")
   = refresh_sidebar_for(:campaigns, :show, :summary)
 - else
-  $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+  $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');

data/app/views/opportunities/edit.js.haml

@@ -8,14 +8,14 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
   - else                                            # Called from index page...
-    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
 
 - else # <----------------------------------------- Show requested [Edit Opportunity] form.
 
   - if params[:cancel].blank?                       # Called from opportunities list item...
     - if @previous                                  # Hide open [Edit Opportunity] form if any.
       - if @previous.is_a?(Opportunity)
-        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(partial: entity_name, collection: [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
 
@@ -24,10 +24,10 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    $('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{id}').html('#{ j render(partial: "edit") }');
 
   - elsif params[:cancel].false?                    # Called from title of the opportunity landing page...
-    $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    $('#edit_#{entity_name}').html('#{ j render(partial: "edit") }');
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @opportunity.name}");
 

data/app/views/opportunities/index.js.haml

@@ -4,8 +4,8 @@
 - if @entities.any?
   $('##{entities}').html('#{ j render(@entities) }');
 - else
-  $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{entities}').html('#{ j render(partial: "shared/empty") }');
 
-$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
-$('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(partial: "shared/export") }');
+$('#search_results_count').html('#{ j render(plain: t('search_results_count', count: @search_results_count)) }');

data/app/views/opportunities/index.xls.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
   xml.Table do
     unless @opportunities.empty?
@@ -61,7 +63,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_opportunities) do
           data.each do |value|
             xml.Cell do
               xml.Data value,
-                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+                       'ss:Type' => (value.respond_to?(:abs) ? 'Number' : 'String').to_s
             end
           end
         end

data/app/views/opportunities/new.js.haml

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
   -# this function call is the only difference to normal new.js.haml
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });

data/app/views/opportunities/show.html.haml

@@ -1,22 +1,22 @@
 - if (template = template_for_current_view)
-  = render(template, :opportunity => @opportunity)
+  = render(template, opportunity: @opportunity)
 - else
 
   -# default view
 
   = styles_for :task, :contact
 
-  = render 'opportunities/title_bar', :opportunity => @opportunity
+  = render 'opportunities/title_bar', opportunity: @opportunity
 
-  = render "comments/new", :commentable => @opportunity
-  = render :partial => "shared/timeline", :collection => @timeline
+  = render "comments/new", commentable: @opportunity
+  = render partial: "shared/timeline", collection: @timeline
 
   = hook(:show_opportunity_bottom, self, {entity: @opportunity}) do
 
-    = render "tasks/tasks", :object => @opportunity
+    = render "tasks/tasks", object: @opportunity
 
-    = render "contacts/contacts", :object => @opportunity
+    = render "contacts/contacts", object: @opportunity
 
-    = render "versions/versions", :object => @opportunity
+    = render "versions/versions", object: @opportunity
 
     = load_select_popups_for(@opportunity, :tasks, :contacts)