Work on layout and content for Requests and Accounts admin pages.

diff --git a/views/admin/registrations/accountsDashboard.html b/views/admin/registrations/accountsDashboard.html
index 9f26b15..37bd679 100644 (file)
--- a/views/admin/registrations/accountsDashboard.html
+++ b/views/admin/registrations/accountsDashboard.html
@@ -35,10 +35,16 @@
         <thead>
             <tr>
                 <th>ID</th>
-                <th>Active</th>
-                <th>Name</th>
-                <th>Created</th>
                 <th>Member ID</th>
+                <th>Active</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Organization</th>
+                <th>Title</th>
+                <th>City</th>
+                <th>State</th>
+                <th>Phone</th>
+                <th>Created</th>                
             </tr>
         </thead>
         <tbody>
@@ -48,14 +54,19 @@
         {else}
             <tr class="alternate">
         {/if}
-            <td>{$account.id}</td>
+            <td><a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&accountID={$account.id}">{$account.id}</a></td>
+            <td>{$account.member_id}</td>
             <td>{$account.active.name}</td>
-            <td>
-                <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&accountID={$account.id}">{$account.fname} {$account.lname}</a>
-            </td>
+            <td>{$account.fname}</td>
+            <td>{$account.lname}</td>
+            <td>{$account.org}</td>
+            <td>{$account.title}</td>
+            <td>{$account.city}</td>
+            <td>{$account.state.name}</td>
+            <td>{$account.phone}</td>
             <td>{$account.date_created.timestamp|date_format:"%D"}</td>
-            <td>{$account.member_id}</td>
         </tr>
+        </tbody>
     {/foreach}
     </table>
 {/if}

diff --git a/views/admin/registrations/requestDashboard.html b/views/admin/registrations/requestDashboard.html
index baaa708..36f75dd 100644 (file)
--- a/views/admin/registrations/requestDashboard.html
+++ b/views/admin/registrations/requestDashboard.html
@@ -74,11 +74,26 @@
                             <b>Total:</b> {$cart.request.total}
                         </div>
                         <div class="glm-small-12 glm-column">
-                            <b>Method:</b> {$cart.request.pay_method.name}
+                            <b>Name on Card:</b> {$cart.request.cc_name}
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Card Type:</b> {$cart.request.cc_type.name}
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Card Number:</b> {$cart.request.cc_numb}
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Expiration:</b> {$cart.request.cc_exp}
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Confirmation:</b> {$cart.request.cc_conf}
+                        </div>
+                        <div class="glm-small-12 glm-column">
+                            <b>Card Process Msg:</b> {$cart.request.cc_proc_mesg}
                         </div>
                     {else}
                         <div class="glm-small-12 glm-column">
-                            (n/a)
+                            (not available)
                         </div>
                     {/if}
                     </div>
@@ -121,6 +136,8 @@
                             <div id="viewSummaryDialog" class="glm-dialog-box" title="Registration Request Checkout Summary">
                                 {$cart.request.summary}
                             </div>
+                    {else}
+                            (not available)
                     {/if}
                         </div>
                     </div>