Merge pull request #16 from eatonphil/billing-invoice

Fix things up after rebase

Author: na3d

src/api/generic/index.js

@@ -2,6 +2,7 @@
 const generics = [
   'distributions', 'regions', 'types', 'linodes', 'volumes', 'stackscripts', 'kernels', 'domains',
   'nodebalancers', 'profile', 'account', 'events', 'tokens', 'clients', 'users', 'tickets', 'apps',
+  'invoices',
 ];
 
 // eslint-disable-next-line global-require

src/api/generic/invoices.js

@@ -8,7 +8,7 @@ export const config = genConfig({
   supports: [ONE, MANY],
   subresources: {
     _items: {
-      singular: 'items',
+      plural: 'items',
       endpoint: id => `/account/invoices/${id}/items`,
       supports: [ONE],
     },

src/billing/layouts/IndexPage.js

@@ -5,12 +5,12 @@ import { push } from 'react-router-redux';
 import { Tabs } from 'linode-components/tabs';
 
 import { setAnalytics, setTitle } from '~/actions';
-import { account, invoices } from '~/api';
+import api from '~/api';
 
 
 export class IndexPage extends Component {
   static async preload({ dispatch }) {
-    await Promise.all([account.one(), invoices.all()].map(r => dispatch(r)));
+    await Promise.all([api.account.one(), api.invoices.all()].map(r => dispatch(r)));
   }
 
   componentDidMount() {

src/billing/layouts/InvoicePage.js

@@ -5,14 +5,14 @@ import moment from 'moment-timezone';
 import { getStorage } from '~/storage';
 import { Card, CardHeader } from 'linode-components/cards';
 import { Table } from 'linode-components/tables';
-import { invoices } from '~/api';
+import api from '~/api';
 
 import { setSource } from '~/actions/source';
 
 
 export class InvoicePage extends Component {
   static async preload({ dispatch, getState }, { invoiceId }) {
-    await dispatch(invoices.items.one([invoiceId]));
+    await dispatch(api.invoices.items.one([invoiceId]));
   }
 
   componentDidMount() {