From 75657c0d67d94b9083f280f7c7afb09b501f3183 Mon Sep 17 00:00:00 2001 From: Dev TWIN0906 Date: Tue, 27 May 2025 13:47:23 +0900 Subject: [PATCH] Resolve merge conflicts in UnableProduct.jsx --- .../components/MobileSend/MobileSendPopUp.jsx | 24 +++++++---- .../src/components/TItemCard/TItemCard.jsx | 6 ++- .../src/utils/helperMethods.js | 2 +- .../DetailPanel/GroupProduct/GroupProduct.jsx | 43 +++++++++++-------- .../UnableProduct/UnableProduct.jsx | 1 - .../components/indicator/Indicator.jsx | 1 + .../ThemeCurationProductListItem.jsx | 1 - .../ThemeCurationPanel/ThemeCurationPanel.jsx | 1 + 8 files changed, 48 insertions(+), 31 deletions(-) diff --git a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx index 2f82fcc0..47e40d06 100644 --- a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx +++ b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx @@ -36,8 +36,16 @@ import { clearCurationCoupon, setEventIssueReq, } from "../../actions/eventActions"; -import { sendLogShopByMobile, sendLogTotalRecommend } from "../../actions/logActions"; -import { ACTIVE_POPUP, LOG_CONTEXT_NAME, LOG_MESSAGE_ID, LOG_TP_NO } from "../../utils/Config"; +import { + sendLogShopByMobile, + sendLogTotalRecommend, +} from "../../actions/logActions"; +import { + ACTIVE_POPUP, + LOG_CONTEXT_NAME, + LOG_MESSAGE_ID, + LOG_TP_NO, +} from "../../utils/Config"; import { $L, decryptPhoneNumber, @@ -383,9 +391,7 @@ export default function MobileSendPopUp({ if (smsTpCd === "APP00204") { params = { ...params, curationId }; } - - - + dispatch(sendSms(params)); } // EVT00101 & APP00207(welcome) EVT00103 & APP00209 (welcome+Prizes) : smsTpCd 값을 받지 않음 @@ -436,12 +442,12 @@ export default function MobileSendPopUp({ curationCouponSuccess === 0 ) { const logParams = { - status: 'send', + status: "send", nowMenu: nowMenu, partner: patncNm, contextName: LOG_CONTEXT_NAME.SHOPBYMOBILE, - messageId: LOG_MESSAGE_ID.SMB - } + messageId: LOG_MESSAGE_ID.SMB, + }; dispatch(sendLogTotalRecommend(logParams)); if (shopByMobileLogRef) { let params = { @@ -451,7 +457,7 @@ export default function MobileSendPopUp({ mbphNoFlag: "Y", trmsAgrFlag: "Y", }; - + dispatch(sendLogShopByMobile(params)); shopByMobileLogRef.current = null; } diff --git a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx index 0773dfc3..c0645cd3 100644 --- a/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx +++ b/com.twin.app.shoptime/src/components/TItemCard/TItemCard.jsx @@ -73,9 +73,10 @@ export default memo(function TItemCard({ shelfId, shelfLocation, shelfTitle, - contentId, contentTitle, categoryTitle, + curationId, + curationTitle, ...rest }) { const dispatch = useDispatch(); @@ -131,8 +132,9 @@ export default memo(function TItemCard({ discount: discountRate, locaiton: order, category: catNm, - contentId: contentId, contentTitle: contentTitle, + curationId: curationId, + curationTitle: curationTitle, }; dispatch(sendLogTotalRecommend(params)); diff --git a/com.twin.app.shoptime/src/utils/helperMethods.js b/com.twin.app.shoptime/src/utils/helperMethods.js index 704fe362..e5dcd1b3 100644 --- a/com.twin.app.shoptime/src/utils/helperMethods.js +++ b/com.twin.app.shoptime/src/utils/helperMethods.js @@ -144,7 +144,7 @@ let localLaunchParams = { // contentTarget: "V3_3000_AD:SR_SR_1", // contentTarget: "V3_2006_HOMEBANNER:6241018_HP_1_1307_2", // contentTarget: "V3_2004_HOMEBANNER:4241101_HP_9_889", - // contentTarget: "V3_2001_HOMEBANNER:1240712_TM_10", + contentTarget: "V3_2001_HOMEBANNER:1240712_TM_10", }; export const getLaunchParams = () => { diff --git a/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupProduct.jsx b/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupProduct.jsx index 2b1bf327..e418f29f 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupProduct.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupProduct.jsx @@ -11,7 +11,12 @@ import { sendLogShopByMobile, sendLogTotalRecommend, } from "../../../actions/logActions"; -import { LOG_CONTEXT_NAME, LOG_MENU, LOG_MESSAGE_ID, LOG_TP_NO } from "../../../utils/Config"; +import { + LOG_CONTEXT_NAME, + LOG_MENU, + LOG_MESSAGE_ID, + LOG_TP_NO, +} from "../../../utils/Config"; import { formatGMTString, formatLocalDateTime, @@ -101,12 +106,14 @@ export default function GroupProduct({ }; dispatch(sendLogDetail(params)); - dispatch(sendLogTotalRecommend({ - menu: LOG_MENU.DETAIL_PAGE_GROUP_DETAIL, - buttonTitle: 'DESCRIPTION', - contextName: LOG_CONTEXT_NAME.DETAILPAGE, - messageId: LOG_MESSAGE_ID.BUTTONCLICK - })) + dispatch( + sendLogTotalRecommend({ + menu: LOG_MENU.DETAIL_PAGE_GROUP_DETAIL, + buttonTitle: "DESCRIPTION", + contextName: LOG_CONTEXT_NAME.DETAILPAGE, + messageId: LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); } }, [productData]); @@ -116,7 +123,7 @@ export default function GroupProduct({ const discountPrice = productData?.priceInfo?.split("|")[1]; const discountRate = productData?.priceInfo?.split("|")[4]; const logParams = { - status: 'open', + status: "open", nowMenu: nowMenu, partner: productData?.patncNm, productId: productData?.prdtId, @@ -126,15 +133,17 @@ export default function GroupProduct({ discount: discountRate, category: productData?.catNm, contextName: LOG_CONTEXT_NAME.SHOPBYMOBILE, - messageId: LOG_MESSAGE_ID.SMB - } - dispatch(sendLogTotalRecommend(logParams)) - dispatch(sendLogTotalRecommend({ - menu: LOG_MENU.DETAIL_PAGE_GROUP_DETAIL, - buttonTitle: 'Shop By Mobile', - contextName: LOG_CONTEXT_NAME.DETAILPAGE, - messageId: LOG_MESSAGE_ID.BUTTONCLICK - })) + messageId: LOG_MESSAGE_ID.SMB, + }; + dispatch(sendLogTotalRecommend(logParams)); + dispatch( + sendLogTotalRecommend({ + menu: LOG_MENU.DETAIL_PAGE_GROUP_DETAIL, + buttonTitle: "Shop By Mobile", + contextName: LOG_CONTEXT_NAME.DETAILPAGE, + messageId: LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); } if (productData && Object.keys(productData).length > 0) { const params = { diff --git a/com.twin.app.shoptime/src/views/DetailPanel/UnableProduct/UnableProduct.jsx b/com.twin.app.shoptime/src/views/DetailPanel/UnableProduct/UnableProduct.jsx index 1cc0661e..e165ec03 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/UnableProduct/UnableProduct.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/UnableProduct/UnableProduct.jsx @@ -104,7 +104,6 @@ export default function UnableProduct({ patncNm: productData?.patncNm ?? "", patnrId: productData?.patnrId ?? "", }; - dispatch(sendLogDetail(params)); dispatch( sendLogTotalRecommend({ diff --git a/com.twin.app.shoptime/src/views/DetailPanel/components/indicator/Indicator.jsx b/com.twin.app.shoptime/src/views/DetailPanel/components/indicator/Indicator.jsx index c6e073d9..4018aef6 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/components/indicator/Indicator.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/components/indicator/Indicator.jsx @@ -175,6 +175,7 @@ function Indicator({ }, [selectedIndex, isLoading]); const handleVideoOnClick = useCallback(() => { + console.log("###productInfo", productInfo); if (canPlayVideo) { dispatch( startVideoPlayer({ diff --git a/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationContents/ThemeCurationProductList/ThemeCurationProductListItem/ThemeCurationProductListItem.jsx b/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationContents/ThemeCurationProductList/ThemeCurationProductListItem/ThemeCurationProductListItem.jsx index 1dbdb2c1..9554a6b4 100644 --- a/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationContents/ThemeCurationProductList/ThemeCurationProductListItem/ThemeCurationProductListItem.jsx +++ b/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationContents/ThemeCurationProductList/ThemeCurationProductListItem/ThemeCurationProductListItem.jsx @@ -152,7 +152,6 @@ export default function ThemeCurationProductListItem({ offerInfo={offerInfo} curationId={themeMenuShelfInfo?.curationId} curationTitle={themeMenuShelfInfo?.curationNm} - contentId={prdtId} contentTitle={prdtNm} shelfId={themeMenuShelfInfo?.shelfInfos[contentsIndex]?.shelfId} shelfLocation={ diff --git a/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationPanel.jsx b/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationPanel.jsx index 234f009b..42c27c95 100644 --- a/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationPanel.jsx +++ b/com.twin.app.shoptime/src/views/ThemeCurationPanel/ThemeCurationPanel.jsx @@ -236,6 +236,7 @@ export default function ThemeCurationPanel({ panelInfo, spotlightId }) { contextName: LOG_CONTEXT_NAME.THEME_CURATION, messageId: LOG_MESSAGE_ID.SHELF, }; + console.log("###params", params); dispatch(sendLogTotalRecommend(params)); } });