Merge branch '2-napraviti-dodavanje-termina' into 'master'

Added customer composite key

Closes #2

See merge request kbr4/zsterminator!2

app/views/reservations/_reservation.html.erb

@@ -6,7 +6,8 @@
 
   <p class="my-5">
     <strong class="block font-medium mb-1">Customer:</strong>
-    <%= reservation.customer_id %>
+    <%= reservation.customer.try(:full_name) || "N/A" %>
+    (<%= reservation.customer.try(:birthyear) %>)
   </p>
 
   <p class="my-5">
@@ -16,12 +17,12 @@
 
   <p class="my-5">
     <strong class="block font-medium mb-1">Start time:</strong>
-    <%= reservation.start_time %>
+    <%= l reservation.start_time if reservation.start_time %>
   </p>
 
   <p class="my-5">
     <strong class="block font-medium mb-1">End time:</strong>
-    <%= reservation.end_time %>
+    <%= l reservation.end_time if reservation.end_time %>
   </p>
 
 </div>