Skip to content

Commit d93af1a

Browse files
authored
Merge pull request #127 from MUIT-UMC/114/refactor-디테일-수정
결제방식 변경
2 parents 058e4db + e9c18d9 commit d93af1a

3 files changed

Lines changed: 16 additions & 19 deletions

File tree

src/components/buy/Step2.jsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Step2 = () => {
1616
const navigate = useNavigate();
1717
const location = useLocation();
1818
const peopleCount = location.state?.peopleCount || 1;
19-
const [selectedTicketId, setSelectedTicketId] = useState("1");
19+
const [selectedTicketName, setSelectedTicketName] = useState("일반 예매");
2020

2121
const url = `/tickets/${amateurId}/ticketInfo`;
2222
const { data, error, loading } = useCustomFetch(url, {
@@ -32,18 +32,19 @@ const Step2 = () => {
3232

3333

3434
// 🎯 선택된 티켓 정보 찾기
35-
const selectedTicket = ticketInfo.tickets.find(ticket => ticket.amateurTicketId === selectedTicketId);
35+
const selectedTicket = ticketInfo.tickets.find(ticket => ticket.ticketName === selectedTicketName);
3636
const ticketPrice = selectedTicket ? selectedTicket.price : 0;
3737

3838
// 🎯 할인 선택 핸들러
3939
const handleDiscountChange = (event) => {
40-
setSelectedTicketId(event.target.value);
40+
setSelectedTicketName(event.target.value);
4141
};
42+
4243
const handleNextStep = () => {
4344
navigate('../step3', {
4445
state: {
4546
peopleCount,
46-
selectedTicketId,
47+
selectedTicketName,
4748
ticketInfo,
4849
},
4950
});
@@ -69,22 +70,22 @@ const Step2 = () => {
6970
<Option>
7071
<RadioButton type="radio"
7172
name="discount"
72-
value="1"
73-
checked={selectedTicketId === "1"}
73+
value="일반 예매"
74+
checked={selectedTicketName === "일반 예매"}
7475
onChange={handleDiscountChange} /> 할인 없음
7576
</Option>
7677
<Option>
7778
<RadioButton type="radio"
7879
name="discount"
79-
value="2"
80-
checked={selectedTicketId === "2"}
80+
value="홍대생 할인"
81+
checked={selectedTicketName === "홍대생 할인"}
8182
onChange={handleDiscountChange} /> 홍대생 할인
8283
</Option>
8384
<Option>
8485
<RadioButton type="radio"
8586
name="discount"
86-
value="2"
87-
checked={selectedTicketId === "2"}
87+
value="홍대생 할인"
88+
checked={selectedTicketName === "홍대생 할인"}
8889
onChange={handleDiscountChange} /> 지인 할인
8990
</Option>
9091
</Options>

src/components/buy/Step3.jsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const Step3 = () => {
1515
const {amateurId} = useParams();
1616
const navigate = useNavigate();
1717
const location = useLocation();
18-
const { peopleCount = 1, selectedTicketId = '1' } = location.state || {};
18+
const { peopleCount = 1, selectedTicketName="일반 예매" } = location.state || {};
1919

2020
const url = `/tickets/${amateurId}/ticketInfo`;
2121
const { data, error, loading } = useCustomFetch(url, {
@@ -32,9 +32,7 @@ const Step3 = () => {
3232
const memberInfo = data.result.reserveConfirmMemberDTO;
3333

3434
// 선택된 티켓 정보 찾기
35-
const selectedTicket = ticketInfo.tickets.find(
36-
(ticket) => ticket.amateurTicketId === selectedTicketId
37-
);
35+
const selectedTicket = ticketInfo.tickets.find(ticket => ticket.ticketName === selectedTicketName);
3836
const ticketPrice = selectedTicket ? selectedTicket.price : 0;
3937
// 총 결제 금액 계산
4038
const totalAmount = ticketPrice * peopleCount;
@@ -43,7 +41,7 @@ const Step3 = () => {
4341
navigate('../step4', {
4442
state: {
4543
peopleCount,
46-
selectedTicketId,
44+
selectedTicketName,
4745
ticketInfo,
4846
},
4947
});

src/components/buy/Step4.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Step4 = () => {
1313
const [isSubmitting, setIsSubmitting] = useState(false);
1414
const isButtonActive = accountName.trim().length > 0;
1515
const location = useLocation();
16-
const { peopleCount, selectedTicketId,ticketInfo } = location.state || {};
16+
const { peopleCount, selectedTicketName="일반 예매",ticketInfo } = location.state || {};
1717

1818
const handleSubmit = async () => {
1919
if (!isButtonActive || isSubmitting) return;
@@ -51,9 +51,7 @@ const Step4 = () => {
5151
}
5252
};
5353
// 선택된 티켓 정보 찾기
54-
const selectedTicket = ticketInfo.tickets.find(
55-
(ticket) => ticket.amateurTicketId === selectedTicketId
56-
);
54+
const selectedTicket = ticketInfo.tickets.find(ticket => ticket.ticketName === selectedTicketName);
5755
const ticketPrice = selectedTicket ? selectedTicket.price : 0;
5856
// 총 결제 금액 계산
5957
const totalAmount = ticketPrice * peopleCount;

0 commit comments

Comments
 (0)