From e1e90a83cf5b540c6c5d266987e445fc1662b7f3 Mon Sep 17 00:00:00 2001
From: wmcheng <wmcheng@rulingcom.com>
Date: Thu, 13 Jun 2019 22:03:31 +0800
Subject: [PATCH] Fix show issue if no enough info. provided.

---
 app/controllers/property_hires_controller.rb | 60 ++++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/controllers/property_hires_controller.rb b/app/controllers/property_hires_controller.rb
index 9ff91bd..ddc31cf 100644
--- a/app/controllers/property_hires_controller.rb
+++ b/app/controllers/property_hires_controller.rb
@@ -69,39 +69,51 @@ class PropertyHiresController < ApplicationController
         "value" => property.note
       }
     end
-    data << {
-      "header" => t("property_hire.property_number"),
-      "value" => property.property_number
-    }
+    if !property_hire.property_number.blank?
+        data << {
+         "header" => t("property_hire.property_number"),
+        "value" => property.property_number
+        }
+    end    
     data << {
       "header" => t("property_hire.can_be_hired"),
       "value" => (property.can_be_hired ? "<span class='label label-success'>Yes</span>" : "<span class='label label-danger'>No</span>")
     }
-    data << {
-      "header" => t("property_hire.purchase_date"),
-      "value" => property.purchase_date.strftime("%Y-%m-%d")
-    }
+    if !property_hire.purchase_date.blank?
+        data << {
+        "header" => t("property_hire.purchase_date"),
+        "value" => property.purchase_date.strftime("%Y-%m-%d")
+        }
+    end
     if property.owners.empty?
       owners = property.other_owner
     else
       owners = property.owner_profiles.collect{|mp| mp.name}.join(",")
     end
-    data << {
-      "header" => t("property_hire.owners"),
-      "value" => owners
-    }
-    data << {
-      "header" => t("property_hire.owner_email"),
-      "value" => property.owner_email
-    }
-    data << {
-      "header" => t("property_hire.owner_phone"),
-      "value" => property.owner_phone
-    }
-    data << {
-      "header" => t("property_hire.price"),
-      "value" => property.price
-    }
+    if !property_hire.owners.blank?
+        data << {
+         "header" => t("property_hire.owners"),
+         "value" => owners
+        }
+    end
+    if !property_hire.owner_email.blank?
+        data << {
+          "header" => t("property_hire.owner_email"),
+        "value" => property.owner_email
+        }
+    end
+    if !property_hire.owner_phone.blank?
+        data << {
+          "header" => t("property_hire.owner_phone"),
+        "value" => property.owner_phone
+        }
+    end
+    if !property_hire.price.blank?
+        data << {
+          "header" => t("property_hire.price"),
+         "value" => property.price
+        }
+    end    
     data << {
       "header" => t("property_hire.location"),
       "value" => property.get_location_name