From a0cdaac37074f61ff776058daf71cadcc7b2a6d2 Mon Sep 17 00:00:00 2001
From: Tom Bloor <tom@tbsliver.me>
Date: Fri, 17 Nov 2017 18:09:49 +0000
Subject: [PATCH] Refactored valid read template slightly and added merge link

---
 .../admin/organisations/valid_read.html.ep    | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/templates/admin/organisations/valid_read.html.ep b/templates/admin/organisations/valid_read.html.ep
index db6bd95..046f3f9 100644
--- a/templates/admin/organisations/valid_read.html.ep
+++ b/templates/admin/organisations/valid_read.html.ep
@@ -41,19 +41,34 @@ function initMap() {
           <div class="form-group row">
             <label for="name" class="col-md-4 col-form-label">Organisation Name</label>
             <div class="col-md-8">
-              <input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name" value="<%= $valid_org->name %>">
+              <input  id="name"
+                      type="text"
+                      class="form-control"
+                      placeholder="Organisation Name"
+                      name="name"
+                      value="<%= $valid_org->name %>">
             </div>
           </div>
           <div class="form-group row">
             <label for="name" class="col-md-4 col-form-label">Street Name</label>
             <div class="col-md-8">
-              <input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name" value="<%= $valid_org->street_name %>">
+              <input  id="street_name"
+                      type="text"
+                      class="form-control"
+                      placeholder="Street Name"
+                      name="street_name"
+                      value="<%= $valid_org->street_name %>">
             </div>
           </div>
           <div class="form-group row">
             <label for="name" class="col-md-4 col-form-label">Town/City</label>
             <div class="col-md-8">
-              <input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $valid_org->town %>">
+              <input  id="town"
+                      type="text"
+                      class="form-control"
+                      placeholder="Town"
+                      name="town"
+                      value="<%= $valid_org->town %>">
             </div>
           </div>
           <div class="form-group row">
@@ -67,13 +82,21 @@ function initMap() {
           <div class="form-group row">
             <label for="postcode" class="col-md-4 col-form-label">Postcode</label>
             <div class="col-md-8">
-              <input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode" value="<%= $valid_org->postcode %>">
+              <input  id="postcode"
+                      type="text"
+                      class="form-control"
+                      placeholder="Postcode"
+                      name="postcode"
+                      value="<%= $valid_org->postcode %>">
             </div>
           </div>
           <div class="form-group row">
             <label for="pending" class="col-md-4 col-form-label">Validated</label>
             <div class="col-md-8">
-              <input id="pending" type="checkbox" name="pending" value="0"<%= $valid_org->pending ? '' : ' checked' %>>
+              <input  id="pending"
+                      type="checkbox"
+                      name="pending"
+                      value="0"<%= $valid_org->pending ? '' : ' checked' %>>
             </div>
           </div>
           <div class="form-group row">
@@ -92,6 +115,9 @@ function initMap() {
           </div>
         </form>
       </div>
+      <div class="card-footer">
+        <a href="<%= url_for . '/merge' %>" class="btn btn-warning">Merge Org</a>
+      </div>
     </div>
   </div>
   <div class="col-sm-12 col-md-6">
@@ -117,9 +143,9 @@ function initMap() {
             <div class="row text-center">
               <div class="col">From: <%= $transaction->buyer->name %></div>
               <div class="col">To: <%= $transaction->seller->name %></div>
-              <div class="col">Value: <%= $transaction->value %></div>
-              <div class="col">Submitted At: <%= $transaction->submitted_at %></div>
-              <div class="col">Purchase Time: <%= $transaction->purchase_time %></div>
+              <div class="col">Value: <%= format_currency_from_db $transaction->value %></div>
+              <div class="col">Submitted At: <%= format_human_datetime $transaction->submitted_at %></div>
+              <div class="col">Purchase Time: <%= format_human_datetime $transaction->purchase_time %></div>
             </div>
           </a>
         % }