Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
warehouse-management
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
1
Merge Requests
1
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
warehouse-management
Commits
0f30aea9
Commit
0f30aea9
authored
May 06, 2021
by
Darrick Yong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add more styling on order details
parent
8765be73
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
7 deletions
+50
-7
order.css
frontend/public/stylesheets/order.css
+34
-0
order_actions.js
frontend/src/actions/order_actions.js
+2
-1
ItemDetails.jsx
frontend/src/components/order/ItemDetails.jsx
+2
-2
OrderDetails.jsx
frontend/src/components/order/OrderDetails.jsx
+10
-4
WarehouseOrderService.java
...inalproject/warehouse/services/WarehouseOrderService.java
+2
-0
No files found.
frontend/public/stylesheets/order.css
View file @
0f30aea9
...
@@ -76,22 +76,56 @@
...
@@ -76,22 +76,56 @@
}
}
.fulfill-btn
{
.fulfill-btn
{
position
:
relative
;
border
:
1px
solid
green
;
border
:
1px
solid
green
;
color
:
green
;
color
:
green
;
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.4
),
0
1px
1px
rgba
(
0
,
0
,
0
,
0.5
);
}
.fulfill-btn
:hover
{
color
:
white
;
background
:
green
;
box-shadow
:
none
;
}
}
.cancel-btn
{
.cancel-btn
{
position
:
relative
;
border
:
1px
solid
red
;
border
:
1px
solid
red
;
color
:
red
;
color
:
red
;
box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
0.4
),
0
1px
1px
rgba
(
0
,
0
,
0
,
0.5
);
}
.cancel-btn
:hover
{
color
:
white
;
background
:
red
;
}
.fulfill-btn
:active
,
.cancel-btn
:active
{
top
:
2px
;
}
}
.order-details
{
.order-details
{
display
:
flex
;
flex-direction
:
column
;
/* min-height: 0px; */
max-height
:
0px
;
max-height
:
0px
;
overflow
:
hidden
;
overflow
:
hidden
;
transition
:
max-height
1s
ease-out
;
transition
:
max-height
1s
ease-out
;
}
}
.order-details-container
{
overflow
:
hidden
;
padding
:
0
50px
20px
;
box-sizing
:
border-box
;
}
.animate
{
.animate
{
transition
:
max-height
1s
ease-out
;
transition
:
max-height
1s
ease-out
;
max-height
:
200px
;
max-height
:
200px
;
}
.item-detail
~
.item-detail
{
margin-top
:
10px
;
}
}
\ No newline at end of file
frontend/src/actions/order_actions.js
View file @
0f30aea9
...
@@ -35,6 +35,7 @@ export const createOrder = (order) => (dispatch) =>
...
@@ -35,6 +35,7 @@ export const createOrder = (order) => (dispatch) =>
export
const
editOrder
=
(
order
)
=>
(
dispatch
)
=>
{
export
const
editOrder
=
(
order
)
=>
(
dispatch
)
=>
{
OrderAPIUtil
.
editOrder
(
order
)
OrderAPIUtil
.
editOrder
(
order
)
.
then
(
res
=>
{
.
then
(
res
=>
{
dispatch
(
updateOrder
(
res
.
data
))
// debugger
dispatch
(
updateOrder
(
res
))
});
});
}
}
\ No newline at end of file
frontend/src/components/order/ItemDetails.jsx
View file @
0f30aea9
...
@@ -3,9 +3,9 @@ const ItemDetails = ({ item }) => {
...
@@ -3,9 +3,9 @@ const ItemDetails = ({ item }) => {
const
{
itemId
,
itemName
,
itemQuantity
,
itemPrice
,
itemSku
}
=
item
;
const
{
itemId
,
itemName
,
itemQuantity
,
itemPrice
,
itemSku
}
=
item
;
return
(
return
(
<
div
>
<
li
className=
"item-detail"
>
{
`${itemName} -- x ${itemQuantity} bought at ${itemPrice}/ea.`
}
{
`${itemName} -- x ${itemQuantity} bought at ${itemPrice}/ea.`
}
</
div
>
</
li
>
)
)
}
}
...
...
frontend/src/components/order/OrderDetails.jsx
View file @
0f30aea9
...
@@ -43,10 +43,16 @@ const OrderDetails = ({ order, showDetails }) => {
...
@@ -43,10 +43,16 @@ const OrderDetails = ({ order, showDetails }) => {
return
(
return
(
<
div
className=
{
`order-details ${showDetails ? "animate" : ""}`
}
>
<
div
className=
{
`order-details ${showDetails ? "animate" : ""}`
}
>
Order Details
<
div
className=
"order-details-container"
>
{
sampleItems
.
map
(
item
=>
(
Order Details
<
ItemDetails
key=
{
item
.
itemId
}
item=
{
item
}
/>
<
ul
>
))
}
{
sampleItems
.
map
(
item
=>
(
<
ItemDetails
key=
{
item
.
itemId
}
item=
{
item
}
/>
))
}
</
ul
>
</
div
>
</
div
>
</
div
>
)
)
}
}
...
...
src/main/java/com/ascendfinalproject/warehouse/services/WarehouseOrderService.java
View file @
0f30aea9
...
@@ -43,4 +43,6 @@ public class WarehouseOrderService {
...
@@ -43,4 +43,6 @@ public class WarehouseOrderService {
}
}
}
}
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