Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add/amazon order route #1492

Merged
merged 7 commits into from
Apr 18, 2017

Conversation

Diokuz
Copy link
Contributor

@Diokuz Diokuz commented Apr 17, 2017

Design

What was done

  1. Add new Order Route for Amazon Order Details Page.
  2. Update Order Page to display amazon orders on it.
  3. Replace [Invalid] text with value as a fallback in State component.
  4. Fix some flow issues.
  5. Fix some css issues.

What is not done here

  1. Channel icon in Panels, because we have no channels yet
  2. Because of 1, date-time not moved to title (3 panels not look good, 4 better)
  3. Any subnav tabs except Details, because we have no any info for it

2017-04-17 16 25 10

@Diokuz Diokuz force-pushed the add/amazon-order-route branch from e611ee3 to 1428b1a Compare April 17, 2017 13:07
@Diokuz Diokuz requested a review from tonypizzicato April 17, 2017 13:07
@Diokuz Diokuz self-assigned this Apr 17, 2017
Copy link
Contributor

@tonypizzicato tonypizzicato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, except couple tiny notes

@@ -18,6 +18,11 @@ const _getOrder = createAsyncActions(
(refNum: string) => Api.get(`/orders/${refNum}`)
);

const _getAmazonOrder = createAsyncActions(
'getAmazonOrder',
(refNum: string) => Api.get(`/hyperion/orders/111-5296499-9653858/full`) // ${refNum}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hardcoded value

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

export const updateOrder = _updateOrder.perform;
export const updateShipments = _updateShipments.perform;
export const clearFetchErrors =_getOrder.clearErrors;

function orderSucceeded(state: State, payload: Object): State {
const order: OrderParagon = new OrderParagon(payload.result || payload);
const res = payload.result || payload;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this condition can be deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@tonypizzicato
Copy link
Contributor

and i think we should add a link to amazon-order in order-row component in case it's from amazon

@@ -77,19 +80,29 @@ const setCellContents = (order, field) => {
}
};

type Props = {
order: OrderParagon;
columns: Array<*>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have Columns in interface/table.js

@tonypizzicato
Copy link
Contributor

👍

@tonypizzicato tonypizzicato merged commit ae1fa6d into feature/pull_amazon_orders Apr 18, 2017
@tonypizzicato tonypizzicato deleted the add/amazon-order-route branch April 18, 2017 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants