Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
order-management-react
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
order-management-react
Commits
d429673a
Commit
d429673a
authored
May 07, 2021
by
Shanelle Valencia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AFP-98}
🚧
Style show page [
@svalencia
]
parent
872cf962
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
28 deletions
+51
-28
OrderDetails.tsx
src/components/OrderDetails.tsx
+16
-3
OrderShowDetails.tsx
src/components/OrderShowDetails.tsx
+17
-15
SearchOrder.tsx
src/components/SearchOrder.tsx
+4
-2
OrderIndexPage.tsx
src/pages/OrderIndexPage.tsx
+4
-2
OrderShowPage.tsx
src/pages/OrderShowPage.tsx
+10
-6
No files found.
src/components/OrderDetails.tsx
View file @
d429673a
import
React
from
'react'
import
React
from
'react'
import
{
Link
}
from
'react-router-dom'
import
{
Link
}
from
'react-router-dom'
import
{
Table
,
Thead
,
Tbody
,
Tfoot
,
Tr
,
Th
,
Td
,
TableCaption
,
Input
,
Wrap
,
WrapItem
}
from
"@chakra-ui/react"
const
OrderDetails
=
(
props
:
any
)
=>
{
const
OrderDetails
=
(
props
:
any
)
=>
{
...
@@ -8,9 +21,9 @@ const OrderDetails = (props: any) => {
...
@@ -8,9 +21,9 @@ const OrderDetails = (props: any) => {
const
status
=
props
.
status
const
status
=
props
.
status
return
(
return
(
<>
<>
<
td
><
Link
to=
{
"/orders/"
+
orderNumber
}
>
{
orderNumber
}
</
Link
></
t
d
>
<
Td
><
Link
to=
{
"/orders/"
+
orderNumber
}
>
{
orderNumber
}
</
Link
></
T
d
>
<
td
>
{
date
}
</
t
d
>
<
Td
>
{
date
}
</
T
d
>
<
td
>
{
status
}
</
t
d
>
<
Td
>
{
status
}
</
T
d
>
</>
</>
)
)
}
}
...
...
src/components/OrderShowDetails.tsx
View file @
d429673a
...
@@ -24,10 +24,10 @@ const OrderShowDetails = (props: any) => {
...
@@ -24,10 +24,10 @@ const OrderShowDetails = (props: any) => {
return
items
.
map
((
item
:
Item
,
idx
:
number
)
=>
{
return
items
.
map
((
item
:
Item
,
idx
:
number
)
=>
{
return
(
return
(
<
tr
key=
{
idx
}
>
<
tr
key=
{
idx
}
>
<
td
>
{
item
.
itemId
}
</
td
>
<
Td
>
{
item
.
itemId
}
</
Td
>
<
td
>
{
item
.
itemPrice
}
</
td
>
<
Td
>
{
item
.
itemPrice
}
</
Td
>
<
td
>
{
item
.
itemQuantity
}
</
td
>
<
Td
>
{
item
.
itemQuantity
}
</
Td
>
<
td
>
{
item
.
itemSku
}
</
td
>
<
Td
>
{
item
.
itemSku
}
</
Td
>
</
tr
>
</
tr
>
)
)
});
});
...
@@ -37,17 +37,19 @@ const OrderShowDetails = (props: any) => {
...
@@ -37,17 +37,19 @@ const OrderShowDetails = (props: any) => {
return
(
return
(
items
?
items
?
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"lg"
>
<
div
className=
"table-div"
>
<
Tbody
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"lg"
>
<
Tr
>
<
Tbody
>
<
Th
>
ID
</
Th
>
<
Tr
>
<
Th
>
Price
</
Th
>
<
Th
>
ID
</
Th
>
<
Th
>
Quantity
</
Th
>
<
Th
>
Price
</
Th
>
<
Th
>
SKU
</
Th
>
<
Th
>
Quantity
</
Th
>
</
Tr
>
<
Th
>
SKU
</
Th
>
{
itemDetails
}
</
Tr
>
</
Tbody
>
{
itemDetails
}
</
Table
>
</
Tbody
>
</
Table
>
</
div
>
:
:
<
div
className=
"Order without items"
>
<
div
className=
"Order without items"
>
This order didn't contain any items.
This order didn't contain any items.
...
...
src/components/SearchOrder.tsx
View file @
d429673a
...
@@ -75,13 +75,15 @@ const SearchOrder = (props: any) => {
...
@@ -75,13 +75,15 @@ const SearchOrder = (props: any) => {
</
WrapItem
>
</
WrapItem
>
</
Wrap
>
</
Wrap
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"
lg
"
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"
md
"
>
<
T
body
>
<
T
head
>
<
Tr
>
<
Tr
>
<
Th
>
Order number
</
Th
>
<
Th
>
Order number
</
Th
>
<
Th
>
Created
</
Th
>
<
Th
>
Created
</
Th
>
<
Th
>
Order Status
</
Th
>
<
Th
>
Order Status
</
Th
>
</
Tr
>
</
Tr
>
</
Thead
>
<
Tbody
>
{
searchResultArr
}
{
searchResultArr
}
</
Tbody
>
</
Tbody
>
</
Table
>
</
Table
>
...
...
src/pages/OrderIndexPage.tsx
View file @
d429673a
...
@@ -30,13 +30,15 @@ const OrderIndexPage = () => {
...
@@ -30,13 +30,15 @@ const OrderIndexPage = () => {
<
div
className=
"table-div"
>
<
div
className=
"table-div"
>
<
SearchOrder
orders=
{
orders
}
/>
<
SearchOrder
orders=
{
orders
}
/>
<
div
className=
"index-table"
>
<
div
className=
"index-table"
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"
lg
"
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"
md
"
>
<
T
body
>
<
T
head
>
<
Tr
>
<
Tr
>
<
Th
>
Order number
</
Th
>
<
Th
>
Order number
</
Th
>
<
Th
>
Created
</
Th
>
<
Th
>
Created
</
Th
>
<
Th
>
Order Status
</
Th
>
<
Th
>
Order Status
</
Th
>
</
Tr
>
</
Tr
>
</
Thead
>
<
Tbody
>
{
orderDetailsArr
}
{
orderDetailsArr
}
</
Tbody
>
</
Tbody
>
</
Table
>
</
Table
>
...
...
src/pages/OrderShowPage.tsx
View file @
d429673a
...
@@ -4,6 +4,10 @@ import {OrderShowDetails} from 'components';
...
@@ -4,6 +4,10 @@ import {OrderShowDetails} from 'components';
import
{
Order
,
Item
}
from
'Order'
;
import
{
Order
,
Item
}
from
'Order'
;
import
{
useOrder
}
from
'hooks'
import
{
useOrder
}
from
'hooks'
import
{
OrderService
}
from
'services'
import
{
OrderService
}
from
'services'
import
{
Wrap
,
WrapItem
}
from
"@chakra-ui/react"
...
@@ -28,12 +32,12 @@ const OrderShowPage = (props: any) => {
...
@@ -28,12 +32,12 @@ const OrderShowPage = (props: any) => {
}
}
return
(
return
(
<
div
>
<
div
className=
"table-div"
>
<
span
>
<
Wrap
>
<
h3
>
Order Date:
{
order
.
orderCreatedAt
}
</
h3
>
<
WrapItem
>
Order Date:
{
order
.
orderCreatedAt
}
</
WrapItem
>
<
h3
>
Order Number:
{
order
.
id
}
</
h3
>
<
WrapItem
>
Order Number:
{
order
.
id
}
</
WrapItem
>
<
h3
>
Order Status:
{
order
.
orderStatus
}
</
h3
>
<
WrapItem
>
Order Status:
{
order
.
orderStatus
}
</
WrapItem
>
</
span
>
</
Wrap
>
<
OrderShowDetails
items=
{
order
.
orderItems
}
/>
<
OrderShowDetails
items=
{
order
.
orderItems
}
/>
</
div
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment