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.

Sign up for GitHub

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

Jump to bottom

발주 내역 조회/등록/취소 기능 구현 #47

Open
3 tasks done
Jenius-95 opened this issue Jan 14, 2025 · 0 comments
Open
3 tasks done

발주 내역 조회/등록/취소 기능 구현 #47

Jenius-95 opened this issue Jan 14, 2025 · 0 comments
Assignees
@Jenius-95
Labels
feat Spring, Mybatis, etc. ✔merge-ready Merged to develop but yet main ui Bootstrap, Thymeleaf, etc.

Comments

@Jenius-95
Copy link
Contributor

Jenius-95 commented Jan 14, 2025 •
edited by Queue-ri
Loading

Task

  • 발주 내역 조회 기능 구현
  • 발주 내역 등록 기능 구현
  • 발주 내역 취소 기능 구현
    • 발주 상태가 출고대기인 발주에 한해서만 취소 가능함에 유의

Affected Files

- OrderController
- OrderDTO
- OrderListResponseDto
- OrderMapper
- OrderService

- ItemVO
- OrderVO
- OrderMapper.xml

- cancel.css
- order.css
- orderhistory.css

- cancelorder.js
- order.js
- orderhistory.js

- cancelorder.html
- history.html
- register.html

Reminder

layout.html 파일은 merge conflict로 인해 커밋 대상에서 제외됨

  • 해당 파일은 별도의 resolve 브랜치에 커밋될 예정
@Jenius-95 Jenius-95 added feat Spring, Mybatis, etc. ui Bootstrap, Thymeleaf, etc. labels Jan 14, 2025
@Jenius-95 Jenius-95 self-assigned this Jan 14, 2025
@Jenius-95 Jenius-95 changed the title 발주 등록 기능 및 UI 구현 발주 내역 조회 & 발주 취소 기능 및 UI 구현 Jan 14, 2025
@Queue-ri Queue-ri changed the title 발주 내역 조회 & 발주 취소 기능 및 UI 구현 발주 내역 조회/등록/취소 기능 구현 Jan 17, 2025
This was referenced Jan 22, 2025
Merged
Open
Queue-ri pushed a commit that referenced this issue Jan 23, 2025
@Jenius-95
feat: Add order CRD (#47)
40a2cc5
Queue-ri added a commit that referenced this issue Jan 23, 2025
@Queue-ri
feat: Add layout.html for 40a2cc5 (#47)(#63)
77f649a
@Queue-ri Queue-ri mentioned this issue Jan 23, 2025
Merged
Queue-ri added a commit that referenced this issue Jan 23, 2025
@Queue-ri
Merge pull request #64 from ssginc-be/resolve/47
313d5d6 
Resolve merge conflict between issue #47 and #54
@Queue-ri Queue-ri added the ✔merge-ready Merged to develop but yet main label Jan 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Jenius-95 Jenius-95

Labels
feat Spring, Mybatis, etc. ✔merge-ready Merged to develop but yet main ui Bootstrap, Thymeleaf, etc.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Queue-ri @Jenius-95