Merge pull request #325 from hhbb0081/test

Feat: 적립금 주석 해제
readyvery · May 27, 2024 · 636457e · 636457e
2 parents 1007e89 + 3c65b39
commit 636457e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/views/PageComponent/OrderProgress.jsx b/src/components/views/PageComponent/OrderProgress.jsx
@@ -16,7 +16,7 @@ const OrderProgress = () => {
   const [degree, setDegree] = useState(-1);
   const [isOpen, setIsOpen] = useState(false);
   const [refreshKey, setRefreshKey] = useState(0);
-  const { estimatedTime, orderNum, progress } = 
+  const { estimatedTime, orderNum, progress, expectPoint } = 
     useFetchCurrentOrder(orderId, refreshKey); // expectPoint 일시 삭제
   const cancelOrder = useCancelOrder();
   const [rotate, setRotate] = useState(false); //새로고침 클릭시 회전용
@@ -234,13 +234,13 @@ const OrderProgress = () => {
               </div>
             )}
 
-            {/* {degree === 3 ? (
+            {degree === 3 ? (
               <div className="order_progress__point">
                 <span className="order_progress__point_text">
                   <span>{expectPoint}</span>원 적립되었습니다
                 </span>
               </div>
-            ) : null} */}
+            ) : null}
           </div>
 
           {isOpen && (

diff --git a/src/pages/PaymentPage/PaymentPage.jsx b/src/pages/PaymentPage/PaymentPage.jsx
@@ -22,7 +22,7 @@ const PaymentPage = () => {
   const paymentMethodsWidgetRef = useRef(null);
   const { carts, edit, imgUrl, inOut, isOpened, name, storeId, totalPrice } =
     useFetchCartData(cartId);
-  const requestPayment = useRequestPayment();
+  const requestPayment = useRequestPayment(); 
   const point = useGetPoint();
   const paymentRequest = () => {
     const paymentWidget = paymentWidgetRef.current;