Add appointment time display in tooltip and show view

app/views/customer_appointments/_tooltip.html.erb

@@ -9,6 +9,13 @@
 
 <table class="attributes">
 
+  <% if appointment.date %>
+    <tr>
+      <th><%= l(:label_time) %></th>
+      <td><%= appointment.date.strftime('%I:%M %p') %></td>
+    </tr>
+  <% end %>
+
   <% if appointment.customer %>
     <tr>
       <th><%= l(:label_customer, default: "Customer") %></th>

app/views/customer_appointments/show.html.erb

@@ -17,20 +17,22 @@
 </div>
 
 <h2>
-  <% if @appointment.start_date %>
+  <% if @appointment.date %>
     <div class="calendar-badge">
-      <div class="month"><%= @appointment.start_date.strftime('%b').upcase %></div>
-      <div class="day"><%= @appointment.start_date.day %></div>
+      <div class="month"><%= @appointment.date.strftime('%b').upcase %></div>
+      <div class="day"><%= @appointment.date.day %></div>
     </div>
   <% end %>
 
   <span class="appointment-title"><%= @appointment.subject %></span>
 
   <span class="appointment-dates">
-    (<%= format_date(@appointment.start_date) %> 
-    <% if @appointment.duration > 1 %>
-      - <%= format_date(@appointment.due_date) %>
-    <% end %>)
+    <% if @appointment.date %>
+      (<%= format_date(@appointment.date) %> <%= l(:label_at, default: 'at') %> <%= @appointment.date.strftime('%I:%M %p') %>
+      <% if @appointment.respond_to?(:due_date) && @appointment.due_date.present? && @appointment.duration.to_i > 1 %>
+        - <%= format_date(@appointment.due_date) %>
+      <% end %>)
+    <% end %>
   </span>
 </h2>
 
@@ -80,6 +82,12 @@
             </span>
           </div>
         </div>
+        <div class="attribute">
+          <div class="label"><%= l(:label_time, default: 'Time') %>:</div>
+          <div class="value">
+            <%= @appointment.date ? @appointment.date.strftime('%I:%M %p') : '-' %>
+          </div>
+        </div>
         <div class="attribute">
           <div class="label"><%= l(:field_user) %>:</div>
           <div class="value"><%= link_to_user(@appointment.user) %></div>