diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx index ede5c703..f29e3e7a 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx @@ -20,7 +20,10 @@ import { setShowPopup, } from '../../../actions/commonActions'; import { sendLogTotalRecommend } from '../../../actions/logActions'; -import { popPanel } from '../../../actions/panelActions'; +import { + popPanel, + pushPanel, +} from '../../../actions/panelActions'; import TButton from '../../../components/TButton/TButton'; import TPopUp from '../../../components/TPopUp/TPopUp'; import TQRCode from '../../../components/TQRCode/TQRCode'; @@ -249,13 +252,25 @@ export default function InformationContainer({ ); const handleCancel = useCallback(() => { - dispatch(setHidePopup()); - }, [dispatch]); - - const handleDone = useCallback(() => { - dispatch(setHidePopup()); + // dispatch(setHidePopup()); + const { patnrId, prdtId } = checkoutData.productList[0]; dispatch(popPanel()); - }, [dispatch]); + dispatch( + pushPanel({ + name: Config.panel_names.DETAIL_PANEL, + panelInfo: { patnrId, prdtId }, + }) + ); + }, [dispatch, checkoutData]); + + const { shippingAddressList, billingAddressList, cardInfo } = checkoutData || {}; + + useEffect(() => { + if (!shippingAddressList || !billingAddressList || !cardInfo) { + // if (shippingAddressList || billingAddressList || cardInfo) { //확인용도로 반대로 테스트중. + dispatch(setShowPopup(Config.ACTIVE_POPUP.qrPopup)); + } + }, [shippingAddressList, billingAddressList, cardInfo, dispatch]) return ( <> @@ -282,8 +297,8 @@ export default function InformationContainer({ > ADD/EDIT - {checkoutData?.shippingAddressList && ( - + {shippingAddressList && ( + )}
@@ -300,8 +315,8 @@ export default function InformationContainer({ {/*
Mock Billing Address
*/} - {checkoutData?.billingAddressList && ( - + {billingAddressList && ( + )}
@@ -314,7 +329,7 @@ export default function InformationContainer({ > ADD/EDIT - {checkoutData?.cardInfo && } + {cardInfo && }
@@ -355,7 +370,7 @@ export default function InformationContainer({ 'Please update your information and complete the payment on your mobile. By clicking the OK button, you will be redirected to the product details page' )} - + {$L('OK')}