From 089e6590909540e03dd569d2398264a8412f8269 Mon Sep 17 00:00:00 2001 From: Dev TWIN0906 Date: Tue, 27 May 2025 15:31:48 +0900 Subject: [PATCH] =?UTF-8?q?checkout=20=ED=99=94=EB=A9=B4=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/CheckOutPanel/CheckOutPanel.jsx | 48 +++++++++++-------- .../container/InformationContainer.jsx | 15 +++--- .../container/SummaryCotainer.jsx | 17 ++++--- .../SingleProduct/SingleProduct.jsx | 17 +++---- .../DetailPanel/ThemeProduct/ShowProduct.jsx | 43 ++++++++++------- 5 files changed, 79 insertions(+), 61 deletions(-) diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx index ab93afbf..091dde72 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx @@ -201,13 +201,15 @@ export default function CheckOutPanel({ panelInfo }) { const toggleOrderSideBar = useCallback(() => { if (!orderSideBarOpen) { dispatch(sendLogCheckOutBtnClick({ btnNm: "ORDER ITEMS" })); - dispatch(sendLogTotalRecommend({ - buttonTitle: "ORDER ITEMS", - buttonId: "checkout_order_items_view", - contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, - messageId: Config.LOG_MESSAGE_ID.PINCODE - })); - console.log('oder items') + dispatch( + sendLogTotalRecommend({ + buttonTitle: "ORDER ITEMS", + buttonId: "checkout_order_items_view", + contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, + messageId: Config.LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); + console.log("oder items"); } setOrderSideBarOpen((prev) => !prev); @@ -217,12 +219,14 @@ export default function CheckOutPanel({ panelInfo }) { const toggleOfferSideBar = useCallback(() => { if (!offerSideBarOpen) { dispatch(sendLogCheckOutBtnClick({ btnNm: "OFFERS & PROMOTION" })); - dispatch(sendLogTotalRecommend({ - buttonTitle: "OFFERS & PROMOTION", - buttonId: "checkout_offers_promotion_view", - contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, - messageId: Config.LOG_MESSAGE_ID.PINCODE - })); + dispatch( + sendLogTotalRecommend({ + buttonTitle: "OFFERS & PROMOTION", + buttonId: "checkout_offers_promotion_view", + contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, + messageId: Config.LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); } setOfferSideBarOpen((prev) => !prev); @@ -249,13 +253,17 @@ export default function CheckOutPanel({ panelInfo }) { const selectedTerms = empTermsData.find( (term) => term.termsID === termsID ); - - dispatch(sendLogTotalRecommend({ - buttonTitle: selectedTerms.termsTypeName, - buttonId: `checkout_terms_${selectedTerms.termsTypeName.toLowerCase().replace(/\s+/g, '_')}`, - contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, - messageId: Config.LOG_MESSAGE_ID.PINCODE - })) + + dispatch( + sendLogTotalRecommend({ + buttonTitle: selectedTerms.termsTypeName, + buttonId: `checkout_terms_${selectedTerms.termsTypeName + .toLowerCase() + .replace(/\s+/g, "_")}`, + contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, + messageId: Config.LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); setCurrentTerms(selectedTerms); dispatch(setShowPopup(Config.ACTIVE_POPUP.termsPopup)); Spotlight.focus("spotlightId_TbuttonScrollerDown"); 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 0470a215..05b286c0 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/InformationContainer.jsx @@ -144,13 +144,14 @@ export default function InformationContainer({ setTab(index); dispatch(setShowPopup(Config.ACTIVE_POPUP.qrPopup)); - dispatch(sendLogTotalRecommend({ - buttonTitle: `${btnNm} ADD/EDIT`, - buttonId: `checkout_info_${btnNm.toLowerCase().replace(/\s+/g, '_')}`, - contextName:Config.LOG_CONTEXT_NAME.CHECKOUT, - messageId: Config.LOG_MESSAGE_ID.PINCODE - })) - + dispatch( + sendLogTotalRecommend({ + buttonTitle: `${btnNm} ADD/EDIT`, + buttonId: `checkout_info_${btnNm.toLowerCase().replace(/\s+/g, "_")}`, + contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, + messageId: Config.LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); }, [dispatch, doSendLogMyInfoEdit] ); diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx index 34f56af9..3d05b2da 100644 --- a/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx +++ b/com.twin.app.shoptime/src/views/CheckOutPanel/container/SummaryCotainer.jsx @@ -38,7 +38,6 @@ export default function SummaryContainer({ (state) => state.checkout?.checkoutData.productList?.[0] ); - const dispatch = useDispatch(); const items = useMemo( @@ -99,19 +98,19 @@ export default function SummaryContainer({ ); const handleClickOrder = useCallback(() => { - if (doSendLogPaymentEntry) { doSendLogPaymentEntry(); } - dispatch(sendLogTotalRecommend({ - buttonTitle: "PLACE ORDER", - buttonId: "checkout_place_order_view", - contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, - messageId: Config.LOG_MESSAGE_ID.PINCODE - })) + dispatch( + sendLogTotalRecommend({ + buttonTitle: "PLACE ORDER", + buttonId: "checkout_place_order_view", + contextName: Config.LOG_CONTEXT_NAME.CHECKOUT, + messageId: Config.LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); setPlaceOrderPopup(true); - }, [doSendLogPaymentEntry, setPlaceOrderPopup]); const renderItemList = useCallback( diff --git a/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleProduct.jsx b/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleProduct.jsx index c1326ee2..a79bcc50 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleProduct.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/SingleProduct/SingleProduct.jsx @@ -120,19 +120,20 @@ export default function SingleProduct({ const handleMobileSendPopupOpen = useCallback(() => { if (productData && Object.keys(productData).length > 0) { - const regularPrice = productData?.priceInfo?.split("|")[0]; - const discountPrice = productData?.priceInfo?.split("|")[1]; - const discountRate = productData?.priceInfo?.split("|")[4]; + const { priceInfo, patncNm, prdtId, prdtNm, brndNm, catNm } = productData; + const regularPrice = priceInfo.split("|")[0]; + const discountPrice = priceInfo.split("|")[1]; + const discountRate = priceInfo.split("|")[4]; const logParams = { status: "open", nowMenu: nowMenu, - partner: productData?.patncNm, - productId: productData?.prdtId, - productTitle: productData?.prdtNm, + partner: patncNm, + productId: prdtId, + productTitle: prdtNm, price: discountRate ? discountPrice : regularPrice, - brand: productData?.brndNm, + brand: brndNm, discount: discountRate, - category: productData?.catNm, + category: catNm, contextName: LOG_CONTEXT_NAME.SHOPBYMOBILE, messageId: LOG_MESSAGE_ID.SMB, }; diff --git a/com.twin.app.shoptime/src/views/DetailPanel/ThemeProduct/ShowProduct.jsx b/com.twin.app.shoptime/src/views/DetailPanel/ThemeProduct/ShowProduct.jsx index c0e3080a..09a89520 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/ThemeProduct/ShowProduct.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/ThemeProduct/ShowProduct.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, @@ -156,12 +161,14 @@ export default function ShowOption({ }; dispatch(sendLogDetail(params)); - dispatch(sendLogTotalRecommend({ - menu: LOG_MENU.DETAIL_PAGE_THEME_DETAIL, - buttonTitle: 'DESCRIPTION', - contextName: LOG_CONTEXT_NAME.DETAILPAGE, - messageId: LOG_MESSAGE_ID.BUTTONCLICK - })) + dispatch( + sendLogTotalRecommend({ + menu: LOG_MENU.DETAIL_PAGE_THEME_DETAIL, + buttonTitle: "DESCRIPTION", + contextName: LOG_CONTEXT_NAME.DETAILPAGE, + messageId: LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); } }, [productData]); @@ -171,7 +178,7 @@ export default function ShowOption({ 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, @@ -181,15 +188,17 @@ export default function ShowOption({ 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_THEME_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_THEME_DETAIL, + buttonTitle: "Shop By Mobile", + contextName: LOG_CONTEXT_NAME.DETAILPAGE, + messageId: LOG_MESSAGE_ID.BUTTONCLICK, + }) + ); } if (showProductInfo && Object.keys(showProductInfo).length > 0) { const params = {