1 files changed, 12 insertions, 18 deletions
diff --git a/finished-application/frontend/components/Order.js b/finished-application/frontend/components/Order.js
index b4a0a0e..5177c0a 100644
--- a/finished-application/frontend/components/Order.js
+++ b/finished-application/frontend/components/Order.js
@@ -1,8 +1,8 @@
-import { Component } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Query } from 'react-apollo';
 import { format } from 'date-fns';
 import Head from 'next/head';
-import PropTypes from 'prop-types';
 import gql from 'graphql-tag';
 import formatMoney from '../lib/formatMoney';
 import Error from './ErrorMessage';
@@ -21,8 +21,8 @@ const SINGLE_ORDER_QUERY = gql`
       items {
         id
         title
-        price
         description
+        price
         image
         quantity
       }
@@ -30,21 +30,16 @@ const SINGLE_ORDER_QUERY = gql`
   }
 `;
 
-class Order extends Component {
+class Order extends React.Component {
   static propTypes = {
     id: PropTypes.string.isRequired,
   };
-
   render() {
     return (
-      <Query
-        query={SINGLE_ORDER_QUERY}
-        variables={{ id: this.props.id }}
-        fetchPolicy="network-only"
-      >
-        {({ data, error, loading, refetch }) => {
+      <Query query={SINGLE_ORDER_QUERY} variables={{ id: this.props.id }}>
+        {({ data, error, loading }) => {
+          if (error) return <Error error={error} />;
           if (loading) return <p>Loading...</p>;
-          if (error) return <Error error={error} refetch={refetch} />;
           const order = data.order;
           return (
             <OrderStyles data-test="order">
@@ -52,8 +47,8 @@ class Order extends Component {
                 <title>Sick Fits - Order {order.id}</title>
               </Head>
               <p>
-                <span>Order Id:</span>
-                <span>{order.id}</span>
+                <span>Order ID:</span>
+                <span>{this.props.id}</span>
               </p>
               <p>
                 <span>Charge</span>
@@ -61,7 +56,7 @@ class Order extends Component {
               </p>
               <p>
                 <span>Date</span>
-                <span>{format(order.createdAt, 'MMMM D, YYYY h:mm A')}</span>
+                <span>{format(order.createdAt, 'MMMM d, YYYY h:mm a')}</span>
               </p>
               <p>
                 <span>Order Total</span>
@@ -76,11 +71,10 @@ class Order extends Component {
                   <div className="order-item" key={item.id}>
                     <img src={item.image} alt={item.title} />
                     <div className="item-details">
-                      <h2> {item.title} </h2>
+                      <h2>{item.title}</h2>
                       <p>Qty: {item.quantity}</p>
                       <p>Each: {formatMoney(item.price)}</p>
-                      <p>Subtotal: {formatMoney(item.price * item.quantity)}</p>
-                      <p>SubTotal: {item.description}</p>
+                      <p>SubTotal: {formatMoney(item.price * item.quantity)}</p>
                       <p>{item.description}</p>
                     </div>
                   </div>