Corrected format of opportunity closing date (closes #7)

fatfreecrm · Aug 16, 2009 · a61fb98 · a61fb98
1 parent 3fa5d86
commit a61fb98
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ Sat, Aug 15, 2009
 ---------------------------------------------------------------------
 - Implemented plugin dependencies to be able to change plugin loading order.
 - Pass on [lead.id] when converting it into a contact (LH #86).
+- Corrected format of opportunity closing date (GH #7).
 
 Fri, Aug 14, 2009
 ---------------------------------------------------------------------

diff --git a/app/views/opportunities/_opportunity.html.haml b/app/views/opportunities/_opportunity.html.haml
@@ -9,18 +9,31 @@
         = link_to_edit(opportunity) + " | "
         = link_to_delete(opportunity) + "&nbsp;"
     = link_to(opportunity.name, opportunity)
+    - if opportunity.account
+      == from #{link_to(opportunity.account.name, account_path(opportunity.account))}
     %tt
       &ndash;
       == added #{time_ago_in_words(opportunity.created_at)} ago by
       == #{opportunity.user.id == @current_user.id ? "me" : opportunity.user.full_name}
     - unless @current_user.preference[:opportunities_outline] == "brief"
       %dt
         %b= number_to_currency(opportunity.weighted_amount, :precision => 0) << " | "
-        - unless %w(won lost).include?(opportunity.stage)
+        - won_or_lost = %w(won lost).include?(opportunity.stage)
+        - unless won_or_lost
           == #{number_to_currency(opportunity.amount || 0, :precision => 0)} with
           == #{opportunity.discount ? number_to_currency(opportunity.discount, :precision => 0) : "no"} discount and
           == #{opportunity.probability || 0}% probability #{"|"}
         - if opportunity.closes_on
-          == expected to close in #{distance_of_time_in_words(Date.today, opportunity.closes_on)}
+          - if won_or_lost
+            - if opportunity.closes_on >= Date.today
+              == closing date is #{opportunity.closes_on.to_s(:mmddyy)}
+            - else
+              == closed #{distance_of_time_in_words(opportunity.closes_on, Date.today)} ago on #{opportunity.closes_on.to_s(:mmddyy)}
+          - elsif opportunity.closes_on > Date.today
+            == expected to close in #{distance_of_time_in_words(Date.today, opportunity.closes_on)} on #{opportunity.closes_on.to_s(:mmddyy)}
+          - elsif opportunity.closes_on == Date.today
+            %span.warn== expected to close today!
+          - else
+            %span.warn== past due, was expected to close #{distance_of_time_in_words(opportunity.closes_on, Date.today)} ago
         - else
           no expected closing date