Merge pull request #18 from joeblas/8_updateClientPage_tyler

working on invoices list page
joeblas · Nov 18, 2017 · 65542ca · 65542ca
2 parents 0e01c69 + e7f65ad
commit 65542ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/imports/api/Users/server/edit-profile.js b/imports/api/Users/server/edit-profile.js
@@ -28,5 +28,5 @@ const editProfile = ({ userId, profile }, promise) => {
 };
 
 export default options =>
-new Promise((resolve, reject) =>
-editProfile(options, { resolve, reject }));
+  new Promise((resolve, reject) =>
+    editProfile(options, { resolve, reject }));
diff --git a/imports/ui/pages/Invoices/Invoices.js b/imports/ui/pages/Invoices/Invoices.js
@@ -34,20 +34,19 @@ const Invoices = ({ loading, invoices, match, history }) => (!loading ? (
           <th />
           <th className="text-center">Status</th>
           <th>Created</th>
-          <th>Client/Subject</th>
+          <th>Client</th>
+          <th>Subject</th>
           <th className="text-center">Total Amount</th>
         </tr>
       </thead>
       <tbody>
-        {invoices.map(({ _id, number, status, createdAt, client, subject, total }) => (
+        {invoices.map(({ _id, number, status, createdAt, recipient, subject, total }) => (
           <tr key={_id} onClick={() => history.push(`${match.url}/${_id}`)}>
             <td>#{number}</td>
             <td className="text-center">{getInvoiceLabel(status)}</td>
             <td>{monthDayYear(createdAt)}</td>
-            <td>
-              <strong>{client}</strong>
-              <p>{subject}</p>
-            </td>
+            <td><strong>{recipient}</strong></td>
+            <td><p>{subject}</p></td>
             <td className="text-center">{formatAsCurrency(centsToDollars(total))}</td>
           </tr>
         ))}

diff --git a/imports/ui/pages/Recipients/Recipients.js b/imports/ui/pages/Recipients/Recipients.js
@@ -19,6 +19,8 @@ const Recipients = ({ loading, recipients, match, history }) => (!loading ? (
       <thead>
         <tr>
           <th>Name</th>
+          <th>Total Due</th>
+          <th>Total Paid</th>
         </tr>
       </thead>
       <tbody>