From 190d139f5aa6b9e634967c701f197a551b4a24f6 Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Wed, 8 Aug 2018 16:48:17 +0200
Subject: [PATCH] use new names from order and process properties

---
 .../src/containers/dashboard/components/NextActionItem.jsx  | 4 ++--
 .../src/containers/dashboard/components/NextActionsList.jsx | 2 +-
 frontend/src/containers/dashboard/components/OrderItem.jsx  | 6 +++---
 frontend/src/containers/dashboard/components/OrdersList.jsx | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/containers/dashboard/components/NextActionItem.jsx b/frontend/src/containers/dashboard/components/NextActionItem.jsx
index f307a46..3d0a455 100644
--- a/frontend/src/containers/dashboard/components/NextActionItem.jsx
+++ b/frontend/src/containers/dashboard/components/NextActionItem.jsx
@@ -10,10 +10,10 @@ class NextActionItem extends Component {
         return (
             <Row className="next-actions-row">
                <Col xl="8">
-                  {nextAction.stepAction}
+                  {nextAction.step_action}
                </Col>
                <Col xl="4">
-                   <Link to={'orders/'+ nextAction.idOrder}>
+                   <Link to={'orders/'+ nextAction.order_id}>
                        <div className={'next-actions-status ' + nextAction.status}>{dashboardTexts.statuses[nextAction.status]}</div>
                    </Link>
                </Col>
diff --git a/frontend/src/containers/dashboard/components/NextActionsList.jsx b/frontend/src/containers/dashboard/components/NextActionsList.jsx
index e5ed86b..7995a9a 100644
--- a/frontend/src/containers/dashboard/components/NextActionsList.jsx
+++ b/frontend/src/containers/dashboard/components/NextActionsList.jsx
@@ -14,7 +14,7 @@ class NextActionsList extends Component {
                         {
                             nextActions &&
                             nextActions.map((nextAction, index) =>
-                                <NextActionItem key={'action-' + nextAction.orderNumber + index} nextAction={nextAction}/>
+                                <NextActionItem key={'action-' + nextAction.order_number + index} nextAction={nextAction}/>
                              )
                         }
                     </WiaasTableBody>
diff --git a/frontend/src/containers/dashboard/components/OrderItem.jsx b/frontend/src/containers/dashboard/components/OrderItem.jsx
index 072df85..5eed5f9 100644
--- a/frontend/src/containers/dashboard/components/OrderItem.jsx
+++ b/frontend/src/containers/dashboard/components/OrderItem.jsx
@@ -12,9 +12,9 @@ class OrderItem extends Component {
             <WiaasTableRow className={'order-central-row line-' + order.status}>
                <WiaasTableCol header="#">
                    <i className="fa fa-list-alt package-photo" aria-hidden="true" />
-                   <div className="orderNumber">{order.orderNumber}</div>
+                   <div className="orderNumber">{order.number}</div>
                </WiaasTableCol>
-               <WiaasTableCol header={dashboardTexts.tableHeaders.ORDER_DATE}>{order.orderDate}</WiaasTableCol>
+               <WiaasTableCol header={dashboardTexts.tableHeaders.ORDER_DATE}>{order.dateCreated}</WiaasTableCol>
                {
                    isViewAllOrdersChecked &&
                    <WiaasTableCol header={dashboardTexts.tableHeaders.PLACED_BY}>{order.placedBy}</WiaasTableCol>
@@ -25,7 +25,7 @@ class OrderItem extends Component {
                <WiaasTableCol header={dashboardTexts.tableHeaders.STATUS}>
                    <div className={'status-icon ' + order.status}></div>{dashboardTexts.statuses[order.status]}
                </WiaasTableCol>
-               <WiaasTableCol><Link to={'orders/'+ order.idOrder}><Button className="wiaas-button">{dashboardTexts.buttons.DETAILS}</Button></Link></WiaasTableCol>
+               <WiaasTableCol><Link to={'orders/'+ order.id}><Button className="wiaas-button">{dashboardTexts.buttons.DETAILS}</Button></Link></WiaasTableCol>
            </WiaasTableRow>
         );
     }
diff --git a/frontend/src/containers/dashboard/components/OrdersList.jsx b/frontend/src/containers/dashboard/components/OrdersList.jsx
index 930436f..34d1c56 100644
--- a/frontend/src/containers/dashboard/components/OrdersList.jsx
+++ b/frontend/src/containers/dashboard/components/OrdersList.jsx
@@ -46,7 +46,7 @@ class OrdersList extends Component {
                         {
                             orders &&
                             orders.map((order, index) =>
-                                <OrderItem key={'order-' + order.orderNumber} order={order} isViewAllOrdersChecked={isViewAllOrdersChecked}/>
+                                <OrderItem key={'order-' + order.number} order={order} isViewAllOrdersChecked={isViewAllOrdersChecked}/>
                              )
                         }
                     </WiaasTableBody>